From: Brett Smith <brett@curoverse.com>
Date: Tue, 20 Oct 2015 15:03:55 +0000 (-0400)
Subject: Clean redundant except: blocks in run_test_server.
X-Git-Tag: 1.1.0~1302^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6b1b4d80445f0e03f89c46a167bebefe7bcf97c0

Clean redundant except: blocks in run_test_server.
---

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index 87b6f9afb9..ca13fc7f19 100644
--- 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():