From ac697e32488d113b307f37c251b918d6c9054cb7 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 8 Mar 2015 11:37:24 +0100 Subject: [PATCH] test/thorlabs_tcube: fix default serial port --- artiq/test/thorlabs_tcube.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/artiq/test/thorlabs_tcube.py b/artiq/test/thorlabs_tcube.py index 3a608dd81..1f5da2828 100644 --- a/artiq/test/thorlabs_tcube.py +++ b/artiq/test/thorlabs_tcube.py @@ -137,11 +137,8 @@ class GenericTpzTest: @unittest.skipIf(no_hardware, "no hardware") class TestTdc(unittest.TestCase, GenericTdcTest): def setUp(self): - serial = os.getenv("ARTIQ_TDC001_SERIAL") - args = dict() - if serial is not None: - args["serial_dev"] = serial - self.cont = Tdc(**args) + serial_dev = os.getenv("ARTIQ_TDC001_SERIAL", "/dev/ttyUSB0") + self.cont = Tdc(serial_dev=serial_dev) class TestTdcSim(unittest.TestCase, GenericTdcTest): @@ -152,11 +149,8 @@ class TestTdcSim(unittest.TestCase, GenericTdcTest): @unittest.skipIf(no_hardware, "no hardware") class TestTpz(unittest.TestCase, GenericTpzTest): def setUp(self): - serial = os.getenv("ARTIQ_TPZ001_SERIAL") - args = dict() - if serial is not None: - args["serial_dev"] = serial - self.cont = Tpz(**args) + serial_dev = os.getenv("ARTIQ_TPZ001_SERIAL", "/dev/ttyUSB0") + self.cont = Tpz(serial_dev=serial_dev) class TestTpzSim(unittest.TestCase, GenericTpzTest):