tests: use try/finally to close event loop + wait for process to die after killing it

fallen · fallen · commit 60bdf74137df · 2015-06-04T13:40:13.000+02:00
diff --git a/artiq/master/worker.py b/artiq/master/worker.py
@@ -101,13 +101,17 @@ def close(self):
                 logger.warning("failed to send terminate command to worker"
                                " (RID %d), killing", self.rid, exc_info=True)
                 self.process.kill()
+                # Wait for process to terminate
+                yield from self.process.communicate()
                 return
             try:
                 yield from asyncio_process_wait_timeout(self.process,
                                                         self.term_timeout)
             except asyncio.TimeoutError:
                 logger.warning("worker did not exit (RID %d), killing", self.rid)
                 self.process.kill()
+                # Wait for process to terminate
+                yield from self.process.communicate()
             else:
                 logger.debug("worker exited gracefully (RID %d)", self.rid)
         finally:
diff --git a/artiq/test/pc_rpc.py b/artiq/test/pc_rpc.py
@@ -75,8 +75,10 @@ def _asyncio_echo(self):
     def _loop_asyncio_echo(self):
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)
-        loop.run_until_complete(self._asyncio_echo())
-        loop.close()
+        try:
+            loop.run_until_complete(self._asyncio_echo())
+        finally:
+            loop.close()
 
     def test_asyncio_echo(self):
         self._run_server_and_test(self._loop_asyncio_echo)
diff --git a/artiq/test/worker.py b/artiq/test/worker.py
@@ -40,23 +40,29 @@ def _call_worker(worker, expid):
 
 
 def _run_experiment(experiment):
-    loop = asyncio.new_event_loop()
-    asyncio.set_event_loop(loop)
-    expid = {
-        "file": sys.modules[__name__].__file__,
-        "experiment": experiment,
-        "arguments": dict()
-    }
-    handlers = {
-        "init_rt_results": lambda description: None
-    }
-
-    worker = Worker(handlers)
-    loop.run_until_complete(_call_worker(worker, expid))
-    loop.close()
+    try:
+        expid = {
+            "file": sys.modules[__name__].__file__,
+            "experiment": experiment,
+            "arguments": dict()
+        }
+        handlers = {
+            "init_rt_results": lambda description: None
+        }
+
+        loop = asyncio.get_event_loop()
+        worker = Worker(handlers)
+        loop.run_until_complete(_call_worker(worker, expid))
+    finally:
+        loop.close()
 
 
 class WatchdogCase(unittest.TestCase):
+
+    def setUp(self):
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
     def test_watchdog_no_timeout(self):
         _run_experiment("WatchdogNoTimeout")
 
@@ -67,3 +73,6 @@ def test_watchdog_timeout(self):
     def test_watchdog_timeout_in_build(self):
         with self.assertRaises(WorkerWatchdogTimeout):
             _run_experiment("WatchdogTimeoutInBuild")
+
+    def tearDown(self):
+        self.loop.close()
