From 4cc9bd33ce145de18a7fec0043e3c6eac0c11f8d Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 24 Apr 2019 11:22:07 +0800 Subject: [PATCH] test: only test_rpc_timing actually requires ARTIQ_LOW_LATENCY --- artiq/test/coredevice/test_performance.py | 11 ----------- artiq/test/coredevice/test_rtio.py | 2 -- artiq/test/coredevice/test_stress.py | 3 --- 3 files changed, 16 deletions(-) diff --git a/artiq/test/coredevice/test_performance.py b/artiq/test/coredevice/test_performance.py index 4be415bec..a376bf73f 100644 --- a/artiq/test/coredevice/test_performance.py +++ b/artiq/test/coredevice/test_performance.py @@ -6,9 +6,6 @@ from artiq.experiment import * from artiq.test.hardware_testbench import ExperimentCase -artiq_low_latency = os.getenv("ARTIQ_LOW_LATENCY") - - class _Transfer(EnvExperiment): def build(self): self.setattr_device("core") @@ -52,24 +49,18 @@ class _Transfer(EnvExperiment): class TransferTest(ExperimentCase): - @unittest.skipUnless(artiq_low_latency, - "timings are dependent on CPU load and network conditions") def test_host_to_device(self): exp = self.create(_Transfer) host_to_device_rate = exp.host_to_device() print(host_to_device_rate, "B/s") self.assertGreater(host_to_device_rate, 2.0e6) - @unittest.skipUnless(artiq_low_latency, - "timings are dependent on CPU load and network conditions") def test_device_to_host(self): exp = self.create(_Transfer) device_to_host_rate = exp.device_to_host() print(device_to_host_rate, "B/s") self.assertGreater(device_to_host_rate, 2.3e6) - @unittest.skipUnless(artiq_low_latency, - "timings are dependent on CPU load and network conditions") def test_device_to_host_array(self): exp = self.create(_Transfer) rate = exp.device_to_host_array() @@ -95,8 +86,6 @@ class _KernelOverhead(EnvExperiment): class KernelOverheadTest(ExperimentCase): - @unittest.skipUnless(artiq_low_latency, - "timings are dependent on CPU load and network conditions") def test_kernel_overhead(self): exp = self.create(_KernelOverhead) kernel_overhead = exp.kernel_overhead() diff --git a/artiq/test/coredevice/test_rtio.py b/artiq/test/coredevice/test_rtio.py index 11204b4ef..1e7693cf5 100644 --- a/artiq/test/coredevice/test_rtio.py +++ b/artiq/test/coredevice/test_rtio.py @@ -527,8 +527,6 @@ class CoredeviceTest(ExperimentCase): with self.assertRaises(exceptions.WatchdogExpired): self.execute(Watchdog) - @unittest.skipUnless(artiq_low_latency, - "timings are dependent on CPU load and network conditions") def test_time_keeps_running(self): self.execute(TimeKeepsRunning) t1 = self.dataset_mgr.get("time_at_start") diff --git a/artiq/test/coredevice/test_stress.py b/artiq/test/coredevice/test_stress.py index a7037f156..514a2d8ac 100644 --- a/artiq/test/coredevice/test_stress.py +++ b/artiq/test/coredevice/test_stress.py @@ -6,9 +6,6 @@ from artiq.experiment import * from artiq.test.hardware_testbench import ExperimentCase -artiq_low_latency = os.getenv("ARTIQ_LOW_LATENCY") - - class _Stress(EnvExperiment): def build(self): self.setattr_device("core")