Move calls to ray.worker.cleanup into tearDown part of tests for isolation. (ray-project#1433)

Author: robertnishihara

test/array_test.py

@@ -16,6 +16,8 @@
 
 
 class RemoteArrayTest(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
 
     def testMethods(self):
         for module in [ra.core, ra.random, ra.linalg, da.core, da.random,
@@ -48,10 +50,10 @@ def testMethods(self):
         r_val = ray.get(r_id)
         assert_almost_equal(np.dot(q_val, r_val), a_val)
 
-        ray.worker.cleanup()
-
 
 class DistributedArrayTest(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
 
     def testAssemble(self):
         for module in [ra.core, ra.random, ra.linalg, da.core, da.random,
@@ -67,8 +69,6 @@ def testAssemble(self):
                      np.vstack([np.ones([da.BLOCK_SIZE, da.BLOCK_SIZE]),
                                 np.zeros([da.BLOCK_SIZE, da.BLOCK_SIZE])]))
 
-        ray.worker.cleanup()
-
     def testMethods(self):
         for module in [ra.core, ra.random, ra.linalg, da.core, da.random,
                        da.linalg]:
@@ -230,8 +230,6 @@ def test_dist_qr(d1, d2):
             d2 = np.random.randint(1, 35)
             test_dist_qr(d1, d2)
 
-        ray.worker.cleanup()
-
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)

test/failure_test.py

@@ -30,6 +30,9 @@ def wait_for_errors(error_type, num_errors, timeout=10):
 
 
 class TaskStatusTest(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
+
     def testFailedTask(self):
         reload(test_functions)
         ray.init(num_workers=3, driver_mode=ray.SILENT_MODE)
@@ -61,8 +64,6 @@ def testFailedTask(self):
                 # ray.get should throw an exception.
                 self.assertTrue(False)
 
-        ray.worker.cleanup()
-
     def testFailImportingRemoteFunction(self):
         ray.init(num_workers=2, driver_mode=ray.SILENT_MODE)
 
@@ -100,7 +101,6 @@ def g():
 
         # Clean up the junk we added to sys.path.
         sys.path.pop(-1)
-        ray.worker.cleanup()
 
     def testFailedFunctionToRun(self):
         ray.init(num_workers=2, driver_mode=ray.SILENT_MODE)
@@ -117,8 +117,6 @@ def f(worker):
         self.assertIn(b"Function to run failed.",
                       ray.error_info()[1][b"message"])
 
-        ray.worker.cleanup()
-
     def testFailImportingActor(self):
         ray.init(num_workers=2, driver_mode=ray.SILENT_MODE)
 
@@ -178,10 +176,11 @@ def get_val(self):
 
         # Clean up the junk we added to sys.path.
         sys.path.pop(-1)
-        ray.worker.cleanup()
 
 
 class ActorTest(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
 
     def testFailedActorInit(self):
         ray.init(num_workers=0, driver_mode=ray.SILENT_MODE)
@@ -215,8 +214,6 @@ def fail_method(self):
         self.assertIn(error_message2,
                       ray.error_info()[1][b"message"].decode("ascii"))
 
-        ray.worker.cleanup()
-
     def testIncorrectMethodCalls(self):
         ray.init(num_workers=0, driver_mode=ray.SILENT_MODE)
 
@@ -254,10 +251,10 @@ def get_val(self, x):
         with self.assertRaises(AttributeError):
             a.nonexistent_method.remote()
 
-        ray.worker.cleanup()
-
 
 class WorkerDeath(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
 
     def testWorkerRaisingException(self):
         ray.init(num_workers=1, driver_mode=ray.SILENT_MODE)
@@ -290,8 +287,6 @@ def f():
         self.assertIn("A worker died or was killed while executing a task.",
                       ray.error_info()[0][b"message"].decode("ascii"))
 
-        ray.worker.cleanup()
-
     def testActorWorkerDying(self):
         ray.init(num_workers=0, driver_mode=ray.SILENT_MODE)
 
@@ -310,8 +305,6 @@ def consume(x):
         self.assertRaises(Exception, lambda: ray.get(consume.remote(obj)))
         wait_for_errors(b"worker_died", 1)
 
-        ray.worker.cleanup()
-
     def testActorWorkerDyingFutureTasks(self):
         ray.init(num_workers=0, driver_mode=ray.SILENT_MODE)
 
@@ -334,8 +327,6 @@ def sleep(self):
 
         wait_for_errors(b"worker_died", 1)
 
-        ray.worker.cleanup()
-
     def testActorWorkerDyingNothingInProgress(self):
         ray.init(num_workers=0, driver_mode=ray.SILENT_MODE)
 
@@ -351,10 +342,10 @@ def getpid(self):
         task2 = a.getpid.remote()
         self.assertRaises(Exception, lambda: ray.get(task2))
 
-        ray.worker.cleanup()
-
 
 class PutErrorTest(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
 
     def testPutError1(self):
         store_size = 10 ** 6
@@ -400,8 +391,6 @@ def put_arg_task():
         # Make sure we receive the correct error message.
         wait_for_errors(b"put_reconstruction", 1)
 
-        ray.worker.cleanup()
-
     def testPutError2(self):
         # This is the same as the previous test, but it calls ray.put directly.
         store_size = 10 ** 6
@@ -446,10 +435,10 @@ def put_task():
         # Make sure we receive the correct error message.
         wait_for_errors(b"put_reconstruction", 1)
 
-        ray.worker.cleanup()
-
 
 class ConfigurationTest(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
 
     def testVersionMismatch(self):
         import cloudpickle
@@ -461,7 +450,6 @@ def testVersionMismatch(self):
         wait_for_errors(b"version_mismatch", 1)
 
         cloudpickle.__version__ = cloudpickle_version
-        ray.worker.cleanup()
 
 
 if __name__ == "__main__":

test/microbenchmarks.py

@@ -16,6 +16,8 @@
 
 
 class MicroBenchmarkTest(unittest.TestCase):
+    def tearDown(self):
+        ray.worker.cleanup()
 
     def testTiming(self):
         reload(test_functions)
@@ -89,8 +91,6 @@ def testTiming(self):
         print("    worst:           {}".format(elapsed_times[999]))
         # average_elapsed_time should be about 0.00087.
 
-        ray.worker.cleanup()
-
     def testCache(self):
         ray.init(num_workers=1)
 
@@ -115,8 +115,6 @@ def testCache(self):
                 print("WARNING: The caching test was too slow. "
                       "d = {}, b = {}".format(d, b))
 
-        ray.worker.cleanup()
-
 
 if __name__ == "__main__":
     unittest.main(verbosity=2)