]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Handle process disappearing before we ask for its PPID
authorNeil Jerram <Neil.Jerram@metaswitch.com>
Sun, 6 Sep 2015 00:09:16 +0000 (01:09 +0100)
committerNeil Jerram <Neil.Jerram@metaswitch.com>
Sun, 6 Sep 2015 00:09:16 +0000 (01:09 +0100)
Change-Id: I573aba8e11dca16f8a6565f7e9704be18e938566
Closes-Bug: #1478190

neutron/tests/functional/test_server.py

index 48891bb7b99037343cdfd4203702c90b026eeb98..e85dcec9b1789e9bb1034961dc8ba7402b8962c4 100644 (file)
@@ -105,9 +105,15 @@ class TestNeutronServer(base.BaseTestCase):
     def _get_workers(self):
         """Get the list of processes in which WSGI server is running."""
 
+        def safe_ppid(proc):
+            try:
+                return proc.ppid
+            except psutil.NoSuchProcess:
+                return None
+
         if self.workers > 0:
             return [proc.pid for proc in psutil.process_iter()
-                    if proc.ppid == self.service_pid]
+                    if safe_ppid(proc) == self.service_pid]
         else:
             return [proc.pid for proc in psutil.process_iter()
                     if proc.pid == self.service_pid]