projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
329da35
)
Clean redundant except: blocks in run_test_server.
author
Brett Smith <brett@curoverse.com>
Tue, 20 Oct 2015 15:03:55 +0000
(11:03 -0400)
committer
Brett Smith <brett@curoverse.com>
Tue, 20 Oct 2015 15:03:55 +0000
(11:03 -0400)
sdk/python/tests/run_test_server.py
patch
|
blob
|
history
diff --git
a/sdk/python/tests/run_test_server.py
b/sdk/python/tests/run_test_server.py
index 87b6f9afb92c9acef6dfaf8802c749d752ffd87c..ca13fc7f193263b75cec187e870d6cfa261b5b73 100644
(file)
--- a/
sdk/python/tests/run_test_server.py
+++ b/
sdk/python/tests/run_test_server.py
@@
-55,9
+55,7
@@
def find_server_pid(PID_PATH, wait=10):
with open(PID_PATH, 'r') as f:
server_pid = int(f.read())
good_pid = (os.kill(server_pid, 0) is None)
- except IOError:
- good_pid = False
- except OSError:
+ except EnvironmentError:
good_pid = False
now = time.time()
@@
-92,9
+90,7
@@
def kill_server_pid(pidfile, wait=10, passenger_root=False):
os.getpgid(server_pid)
time.sleep(0.1)
now = time.time()
- except IOError:
- pass
- except OSError:
+ except EnvironmentError:
pass
def find_available_port():