From 891e3cf1fe18cba8a0b489b6e1ecb8c861971e70 Mon Sep 17 00:00:00 2001 From: whitequark Date: Fri, 18 Mar 2016 22:48:26 +0000 Subject: [PATCH] Commit missing parts of 501de306. --- artiq/test/coredevice/test_rtio.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/artiq/test/coredevice/test_rtio.py b/artiq/test/coredevice/test_rtio.py index c3240caf4..a0b3252ee 100644 --- a/artiq/test/coredevice/test_rtio.py +++ b/artiq/test/coredevice/test_rtio.py @@ -7,6 +7,7 @@ from math import sqrt from artiq.experiment import * from artiq.test.hardware_testbench import ExperimentCase +from artiq.coredevice import exceptions artiq_low_latency = os.getenv("ARTIQ_LOW_LATENCY") @@ -285,7 +286,7 @@ class CoredeviceTest(ExperimentCase): def test_watchdog(self): # watchdog only works on the device - with self.assertRaises(IOError): + with self.assertRaises(exceptions.WatchdogExpired): self.execute(Watchdog) @unittest.skipUnless(artiq_low_latency,