Fix resource (worker processes) leaks at least when tests pass

Author: LourensVeen

src/tests/compile_tests/async_implementation/test_async.py

@@ -647,6 +647,7 @@ def test30(self):
         self.assertEqual(request.result(), numpy.arange(1, 11) | units.m)
         t2 = time.time()
         self.assertGreater(t2-t1, 1.)
+        instance1.stop()
 
     def test31(self):
         """ test a grid attribute request, subgrids """
@@ -662,6 +663,7 @@ def test31(self):
         self.assertEqual(request2.result(), numpy.arange(6, 11) | units.m)
         t2 = time.time()
         self.assertGreater(t2-t1, 1.)
+        instance1.stop()
 
     def test32(self):
         """ test a grid attribute request setter """
@@ -681,6 +683,7 @@ def test32(self):
         self.assertEqual(instance1.grid.x, (11.+numpy.arange(1, 11)) | units.m)
         t2 = time.time()
         self.assertLess(t2-t1, 0.5)
+        instance1.stop()
 
     def test33(self):
         """ test a grid attribute request, subgrids """
@@ -697,13 +700,15 @@ def test33(self):
         self.assertGreater(t2-t1, 1.)
         self.assertEqual(instance1.grid.x[::2], (11.+numpy.arange(1, 11, 2)) | units.m)
         self.assertEqual(instance1.grid.x[1::2], (numpy.arange(2, 11, 2)) | units.m)
+        instance1.stop()
 
     def test34(self):
         """ test a grid attribute request, subgrids """
         instance1 = ForTesting(self.exefile, redirection="none")
         grid = instance1.grid.copy()
         request = instance1.grid.request.x
         self.assertEqual(request.result(), numpy.arange(1, 11) | units.m)
+        instance1.stop()
 
     def test35(self):
         """ test a grid attribute request setter with state"""
@@ -729,6 +734,7 @@ def test35(self):
         self.assertEqual(instance1.grid.x, (12. + numpy.arange(1, 11)) | units.m)
         t2 = time.time()
         self.assertLess(t2-t1, 0.5)
+        instance1.stop()
 
     def test36(self):
         """ more state tests"""
@@ -741,6 +747,7 @@ def test36(self):
         self.assertEqual(instance1.get_name_of_current_state(), '2')
         # ie state changes upon completion of call at wait. This is
         # sort of ok, alternatively state could be changed immediately...
+        instance1.stop()
 
 
 class TestASyncDistributed(TestASync):

src/tests/compile_tests/c_implementation/test_c_implementation.py

@@ -93,34 +93,28 @@ def test7(self):
 
     def test7b(self):
         instance = ForTestingInterface(self.exefile)
-
         out, error = instance.echo_int(numpy.arange(2000000))
+        instance.stop()
 
         self.assertEqual(error, [0]*2000000)
         self.assertEqual(out, numpy.arange(2000000))
 
-        instance.stop()
-
     def test7c(self):
         instance = ForTestingInterface(self.exefile)
-
         out, error = instance.echo_string(["abc"]*10)
+        instance.stop()
 
         self.assertEqual(error, [0]*10)
         self.assertEqual(out, ["abc"]*10)
 
-        instance.stop()
-
     def test7d(self):
         instance = ForTestingInterface(self.exefile)
-
         out, error = instance.echo_string(["abc"]*100000)
+        instance.stop()
 
         self.assertEqual(error, [0]*100000)
         self.assertEqual(out, ["abc"]*100000)
 
-        instance.stop()
-
     def test8(self):
         instance = ForTestingInterface(self.exefile)
         out1, out2, error = instance.echo_strings("abc", "def")
@@ -386,6 +380,8 @@ def test29(self):
         request2.wait()
         port_id1, error1 = request1.result()
         port_id2, error2 = request2.result()
+        instance1.stop()
+        instance2.stop()
         self.assertTrue(port_id1 >= 0)
         self.assertTrue(port_id2 >= 0)
         self.assertEqual(error1, 0)

src/tests/compile_tests/c_implementation/test_c_implementation_simplified.py

@@ -341,6 +341,8 @@ def test29(self):
         request2.wait()
         port_id1, error1 = request1.result()
         port_id2, error2 = request2.result()
+        instance1.stop()
+        instance2.stop()
         self.assertTrue(port_id1 >= 0)
         self.assertTrue(port_id2 >= 0)
         self.assertEqual(error1, 0)

src/tests/compile_tests/fortran_implementation/test_fortran_implementation.py

@@ -26,7 +26,7 @@ def define_methods(self, object):
                 units.m,
                 object.ERROR_CODE,
             )
-        )    
+        )
     """
 
 
@@ -196,11 +196,13 @@ def test16(self):
     def test16b(self):
         instance = ForTesting(self.exefile)
         output = instance.echo_logical([True, True, False, True, False]*256)
+        instance.stop()
         self.assertEqual(output, [True, True, False, True, False]*256)
 
     def test16c(self):
         instance = ForTesting(self.exefile, redirection="none")
         output = instance.echo_logical2([True, True, False, True, False]*1024)
+        instance.stop()
         self.assertEqual(output, [True, True, False, True, False]*1024)
 
     def xtest20(self):
@@ -296,6 +298,8 @@ def test19(self):
         request2.wait()
         port_id1, error1 = request1.result()
         port_id2, error2 = request2.result()
+        instance1.stop()
+        instance2.stop()
         self.assertTrue(port_id1 >= 0)
         self.assertTrue(port_id2 >= 0)
         self.assertEqual(error1, 0)

src/tests/compile_tests/fortran_implementation/test_fortran_sockets_implementation.py

@@ -187,11 +187,13 @@ def test16(self):
     def test16b(self):
         instance = ForTesting(self.exefile, channel_type="sockets")
         output = instance.echo_logical([True, True, False, True, False])
+        instance.stop()
         self.assertEqual(output, [True, True, False, True, False])
 
     def test16c(self):
         instance = ForTesting(self.exefile, redirection="none")
         output = instance.echo_logical2([True, True, False, True, False]*1024)
+        instance.stop()
         self.assertEqual(output, [True, True, False, True, False]*1024)
 
     def xtest20(self):

src/tests/compile_tests/test_python_implementation.py

@@ -468,6 +468,7 @@ def test02(self):
         output_message = python_code.ClientSideMPIMessage(0, 10, 1)
 
         x.handle_message(input_message, output_message)
+        del x
 
         self.assertEqual(len(output_message.ints), 1)
         self.assertEqual(len(output_message.doubles), 1)
@@ -485,6 +486,7 @@ def test03(self):
         output_message = python_code.ClientSideMPIMessage(0, 10, 1)
 
         x.handle_message(input_message, output_message)
+        del x
 
         self.assertEqual(len(output_message.ints), 1)
         self.assertEqual(len(output_message.doubles), 0)
@@ -502,6 +504,7 @@ def test04(self):
         output_message = python_code.ClientSideMPIMessage(0, 10, 4)
 
         x.handle_message(input_message, output_message)
+        del x
 
         self.assertEqual(len(output_message.ints), 4)
         self.assertEqual(len(output_message.doubles), 0)
@@ -536,8 +539,6 @@ def test06(self):
         self.assertEqual(answer[1], 11.0)
         x.stop()
 
-        x.stop()
-
     def test07(self):
         x = self.ForTestingInterface()
 
@@ -546,8 +547,6 @@ def test07(self):
         self.assertEqual(int_out, 20)
         x.stop()
 
-        x.stop()
-
     def test08(self):
         implementation = ForTestingImplementation()
         x = python_code.PythonImplementation(implementation, ForTestingInterface)
@@ -559,53 +558,55 @@ def test08(self):
 
         x.handle_message(input_message, output_message)
 
+        del x
+
         self.assertEqual(len(output_message.ints), 2)
         self.assertEqual(output_message.ints[0], 0)
         self.assertEqual(output_message.ints[1], 20)
 
     def test09(self):
         x = self.ForTestingInterface()
         string_out, error = x.echo_string("1234567")
+        x.stop()
         self.assertEqual(error, 0)
         self.assertEqual(string_out, "1234567")
-        x.stop()
 
     def test10(self):
         x = self.ForTestingInterface()
         string_out, error = x.echo_string(["aaaaa", "bbbb"])
+        x.stop()
         self.assertEqual(error[0], 0)
         self.assertEqual(len(string_out), 2)
         self.assertEqual(string_out[0], "aaaaa")
         self.assertEqual(string_out[1], "bbbb")
-        x.stop()
 
     def test11(self):
         x = self.ForTestingInterface()
         string_out, error = x.echo_string(["", "bbbb"])
+        x.stop()
         self.assertEqual(error[0], 0)
         self.assertEqual(len(string_out), 2)
         self.assertEqual(string_out[0], "")
         self.assertEqual(string_out[1], "bbbb")
-        x.stop()
 
     def test12(self):
         x = self.ForTestingInterface()
         str1_out, str2_out, error = x.echo_strings("abc", "def")
+        x.stop()
         self.assertEqual(error, 0)
         self.assertEqual(str1_out, "cba")
         self.assertEqual(str2_out, "fed")
-        x.stop()
 
     def test13(self):
         x = self.ForTestingInterface()
         str1_out, str2_out, error = x.echo_strings(["abc", "def"], ["ghi", "jkl"])
+        x.stop()
         self.assertEqual(error[0], 0)
         self.assertEqual(error[1], 0)
         self.assertEqual(str1_out[0], "cba")
         self.assertEqual(str1_out[1], "fed")
         self.assertEqual(str2_out[0], "ihg")
         self.assertEqual(str2_out[1], "lkj")
-        x.stop()
 
     def test14(self):
         x = self.ForTestingInterface()
@@ -946,6 +947,8 @@ def test26(self):
         request2.wait()
         port_id1, error1 = request1.result()
         port_id2, error2 = request2.result()
+        instance1.stop()
+        instance2.stop()
         self.assertTrue(port_id1 >= 0)
         self.assertTrue(port_id2 >= 0)
         self.assertEqual(error1, 0)
@@ -1057,6 +1060,7 @@ def test30(self):
         self.assertAlmostRelativeEquals(output, [6.0, 7.0, 8.0])
         output = instance.sum_doubles(5, input)
         self.assertAlmostRelativeEquals(output, [6.0, 7.0, 8.0])
+        instance.stop()
 
     def test31(self):
         x = self.ForTesting()

src/tests/compile_tests/test_python_sockets_implementation.py

@@ -53,6 +53,7 @@ def test2(self):
         output_message = python_code.SocketMessage(0, 10, 1)
 
         x.handle_message(input_message, output_message)
+        del implementation
 
         self.assertEqual(len(output_message.ints), 1)
         self.assertEqual(len(output_message.doubles), 1)
@@ -75,6 +76,7 @@ def test3(self):
         self.assertEqual(len(output_message.doubles), 0)
         self.assertEqual(output_message.ints[0], 0)
         self.assertEqual(implementation.masses[1], 12.0)
+        del implementation
 
     def test4(self):
         implementation = test_python_implementation.ForTestingImplementation()
@@ -96,6 +98,7 @@ def test4(self):
         self.assertEqual(implementation.masses[2], 13.0)
         self.assertEqual(implementation.masses[3], 14.0)
         self.assertEqual(implementation.masses[4], 15.0)
+        del implementation
 
     def test8(self):
         implementation = test_python_implementation.ForTestingImplementation()
@@ -107,6 +110,7 @@ def test8(self):
         output_message = python_code.SocketMessage(0, 10, 1)
 
         x.handle_message(input_message, output_message)
+        del implementation
 
         self.assertEqual(len(output_message.ints), 2)
         self.assertEqual(output_message.ints[0], 0)