M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

test/thorlabs_tcube: fix default serial port

This commit is contained in:
Sebastien Bourdeauducq 2015-03-08 11:37:24 +01:00
parent 28bce9ee40
commit ac697e3248
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/test/thorlabs_tcube.py
View File

@ -137,11 +137,8 @@ class GenericTpzTest:
@unittest.skipIf(no_hardware, "no hardware") @unittest.skipIf(no_hardware, "no hardware")
class TestTdc(unittest.TestCase, GenericTdcTest): class TestTdc(unittest.TestCase, GenericTdcTest):
def setUp(self): def setUp(self):
serial = os.getenv("ARTIQ_TDC001_SERIAL") serial_dev = os.getenv("ARTIQ_TDC001_SERIAL", "/dev/ttyUSB0")
args = dict() self.cont = Tdc(serial_dev=serial_dev)
if serial is not None:
args["serial_dev"] = serial
self.cont = Tdc(**args)
class TestTdcSim(unittest.TestCase, GenericTdcTest): class TestTdcSim(unittest.TestCase, GenericTdcTest):
@ -152,11 +149,8 @@ class TestTdcSim(unittest.TestCase, GenericTdcTest):
@unittest.skipIf(no_hardware, "no hardware") @unittest.skipIf(no_hardware, "no hardware")
class TestTpz(unittest.TestCase, GenericTpzTest): class TestTpz(unittest.TestCase, GenericTpzTest):
def setUp(self): def setUp(self):
serial = os.getenv("ARTIQ_TPZ001_SERIAL") serial_dev = os.getenv("ARTIQ_TPZ001_SERIAL", "/dev/ttyUSB0")
args = dict() self.cont = Tpz(serial_dev=serial_dev)
if serial is not None:
args["serial_dev"] = serial
self.cont = Tpz(**args)
class TestTpzSim(unittest.TestCase, GenericTpzTest): class TestTpzSim(unittest.TestCase, GenericTpzTest):