From dc14728264269a25e693a7b47d04f8df22dcd0e1 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 28 Apr 2015 01:33:37 +0800 Subject: [PATCH] test/full_stack: use Ethernet --- artiq/test/full_stack.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/artiq/test/full_stack.py b/artiq/test/full_stack.py index fc92b4ab6..93da32e15 100644 --- a/artiq/test/full_stack.py +++ b/artiq/test/full_stack.py @@ -5,7 +5,7 @@ from fractions import Fraction from artiq import * from artiq.language.units import DimensionError -from artiq.coredevice import comm_serial, core, runtime_exceptions, rtio +from artiq.coredevice import comm_tcp, core, runtime_exceptions, rtio from artiq.sim import devices as sim_devices @@ -13,7 +13,7 @@ core_device = os.getenv("ARTIQ_CORE_DEVICE") def _run_on_device(k_class, **parameters): - comm = comm_serial.Comm(serial_dev=core_device) + comm = comm_tcp.Comm(host=core_device) try: coredev = core.Core(comm=comm) k_inst = k_class(core=coredev, **parameters) @@ -208,7 +208,7 @@ class ExecutionCase(unittest.TestCase): self.assertEqual(l_device, l_host) def test_misc(self): - comm = comm_serial.Comm(serial_dev=core_device) + comm = comm_tcp.Comm(host=core_device) try: coredev = core.Core(comm=comm) uut = _Misc(core=coredev) @@ -249,7 +249,7 @@ class ExecutionCase(unittest.TestCase): self.assertEqual(t_device, t_host) def test_rpc_exceptions(self): - comm = comm_serial.Comm(serial_dev=core_device) + comm = comm_tcp.Comm(host=core_device) try: uut = _RPCExceptions(core=core.Core(comm=comm)) with self.assertRaises(_MyException): @@ -312,7 +312,7 @@ class RTIOCase(unittest.TestCase): # (C11 and C13 on Papilio Pro) def test_loopback(self): npulses = 4 - comm = comm_serial.Comm(serial_dev=core_device) + comm = comm_tcp.Comm(host=core_device) try: coredev = core.Core(comm=comm) uut = _RTIOLoopback( @@ -327,7 +327,7 @@ class RTIOCase(unittest.TestCase): comm.close() def test_underflow(self): - comm = comm_serial.Comm(serial_dev=core_device) + comm = comm_tcp.Comm(host=core_device) try: coredev = core.Core(comm=comm) uut = _RTIOUnderflow( @@ -340,7 +340,7 @@ class RTIOCase(unittest.TestCase): comm.close() def test_sequence_error(self): - comm = comm_serial.Comm(serial_dev=core_device) + comm = comm_tcp.Comm(host=core_device) try: coredev = core.Core(comm=comm) uut = _RTIOSequenceError(