From d05d720b19a5fc65f000c373bf011f9f218925b5 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Fri, 29 Jan 2016 17:32:59 -0700 Subject: [PATCH] tests: misc fixes, cleanup --- artiq/test/ctlmgr.py | 1 - artiq/test/hardware_testbench.py | 1 + artiq/test/thorlabs_tcube.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/test/ctlmgr.py b/artiq/test/ctlmgr.py index 22cad8ff8..61db39f61 100644 --- a/artiq/test/ctlmgr.py +++ b/artiq/test/ctlmgr.py @@ -65,6 +65,5 @@ class ControllerCase(unittest.TestCase): 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 index d4a244c96..c2b60a153 100644 --- a/artiq/test/hardware_testbench.py +++ b/artiq/test/hardware_testbench.py @@ -46,6 +46,7 @@ class ControllerCase(unittest.TestCase): 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 index 733a0e602..bf04a7a06 100644 --- 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