From: Neil Jerram <Neil.Jerram@metaswitch.com>
Date: Sun, 6 Sep 2015 00:09:16 +0000 (+0100)
Subject: Handle process disappearing before we ask for its PPID
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=42f80682d3eff58af60199f817ac402f457491a0;p=openstack-build%2Fneutron-build.git

Handle process disappearing before we ask for its PPID

Change-Id: I573aba8e11dca16f8a6565f7e9704be18e938566
Closes-Bug: #1478190
---

diff --git a/neutron/tests/functional/test_server.py b/neutron/tests/functional/test_server.py
index 48891bb7b..e85dcec9b 100644
--- a/neutron/tests/functional/test_server.py
+++ b/neutron/tests/functional/test_server.py
@@ -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]