From 46d0e6bdfb940953c94b30195eca3a15a31948c8 Mon Sep 17 00:00:00 2001
From: Robert Nishihara <robertnishihara@gmail.com>
Date: Fri, 9 Dec 2016 13:04:08 -0800
Subject: [PATCH] In tests, check that processes are still alive before killing
 them to catch crashes. (#110)

---
 src/global_scheduler/test/test.py |  7 +++++++
 src/photon/test/test.py           |  4 ++++
 src/plasma/test/test.py           | 11 ++++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/global_scheduler/test/test.py b/src/global_scheduler/test/test.py
index c2269e731..13325871a 100644
--- a/src/global_scheduler/test/test.py
+++ b/src/global_scheduler/test/test.py
@@ -61,6 +61,13 @@ class TestGlobalScheduler(unittest.TestCase):
     self.photon_client = photon.PhotonClient(local_scheduler_name)
 
   def tearDown(self):
+    # Check that the processes are still alive.
+    self.assertEqual(self.p1.poll(), None)
+    self.assertEqual(self.p2.poll(), None)
+    self.assertEqual(self.p3.poll(), None)
+    self.assertEqual(self.p4.poll(), None)
+    self.assertEqual(self.redis_process.poll(), None)
+
     # Kill the global scheduler.
     if USE_VALGRIND:
       self.p1.send_signal(signal.SIGTERM)
diff --git a/src/photon/test/test.py b/src/photon/test/test.py
index 427d69f50..6df731d2a 100644
--- a/src/photon/test/test.py
+++ b/src/photon/test/test.py
@@ -37,6 +37,10 @@ class TestPhotonClient(unittest.TestCase):
     self.photon_client = photon.PhotonClient(scheduler_name)
 
   def tearDown(self):
+    # Check that the processes are still alive.
+    self.assertEqual(self.p1.poll(), None)
+    self.assertEqual(self.p2.poll(), None)
+
     # Kill Plasma.
     self.p1.kill()
     # Kill the local scheduler.
diff --git a/src/plasma/test/test.py b/src/plasma/test/test.py
index 8238530d7..948830b83 100644
--- a/src/plasma/test/test.py
+++ b/src/plasma/test/test.py
@@ -75,6 +75,8 @@ class TestPlasmaClient(unittest.TestCase):
     self.plasma_client2 = plasma.PlasmaClient(plasma_store_name, None, 0)
 
   def tearDown(self):
+    # Check that the Plasma store is still alive.
+    self.assertEqual(self.p.poll(), None)
     # Kill the plasma store process.
     if USE_VALGRIND:
       self.p.send_signal(signal.SIGTERM)
@@ -380,7 +382,11 @@ class TestPlasmaManager(unittest.TestCase):
     self.processes_to_kill = [self.p4, self.p5, self.p2, self.p3]
 
   def tearDown(self):
-    # Kill the PlasmaStore and PlasmaManager processes.
+    # Check that the processes are still alive.
+    for process in self.processes_to_kill:
+      self.assertEqual(process.poll(), None)
+
+    # Kill the Plasma store and Plasma manager processes.
     if USE_VALGRIND:
       time.sleep(1) # give processes opportunity to finish work
       for process in self.processes_to_kill:
@@ -641,8 +647,7 @@ class TestPlasmaManager(unittest.TestCase):
     # exited.
     time_left = 10
     while time_left > 0:
-      self.p5.poll()
-      if self.p5.returncode != None:
+      if self.p5.poll() != None:
         self.processes_to_kill.remove(self.p5)
         break
       time_left -= 0.2