tests: misc fixes, cleanup

jordens · jordens · commit d05d720b19a5 · 2016-01-29T17:32:59.000-07:00
diff --git a/artiq/test/ctlmgr.py b/artiq/test/ctlmgr.py
@@ -65,6 +65,5 @@ def test_start_ping_stop_controller(self):
         async def test():
             await self.start("lda_sim", entry)
             remote = await self.get_client(entry["host"], entry["port"])
-            await remote.close()
 
         self.loop.run_until_complete(test())
diff --git a/artiq/test/hardware_testbench.py b/artiq/test/hardware_testbench.py
@@ -46,6 +46,7 @@ def start_controller(self, name, sleep=1):
     def stop_controller(self, name, default_timeout=1):
         entry, proc = self.controllers[name]
         t = entry.get("term_timeout", default_timeout)
+        proc.terminate()
         try:
             proc.wait(t)
         except subprocess.TimeoutExpired:
diff --git a/artiq/test/thorlabs_tcube.py b/artiq/test/thorlabs_tcube.py
@@ -1,7 +1,7 @@
 import unittest
 import time
 
-from artiq.devices.thorlabs_tcube.driver import Tdc, Tpz, TdcSim, TpzSim
+from artiq.devices.thorlabs_tcube.driver import TdcSim, TpzSim
 from artiq.language.units import V
 from artiq.test.hardware_testbench import ControllerCase
 
