From 82f4fd12909ed64eaa98fde9d17d670676d1b2d6 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 23 Feb 2016 15:48:12 +0800
Subject: [PATCH] test/coredevice: convert to 'with parallel'

---
 artiq/test/coredevice/test_analyzer.py    | 2 +-
 artiq/test/coredevice/test_portability.py | 2 +-
 artiq/test/coredevice/test_rtio.py        | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/artiq/test/coredevice/test_analyzer.py b/artiq/test/coredevice/test_analyzer.py
index bf5af6ad6..b607ecc36 100644
--- a/artiq/test/coredevice/test_analyzer.py
+++ b/artiq/test/coredevice/test_analyzer.py
@@ -12,7 +12,7 @@ class CreateTTLPulse(EnvExperiment):
     def run(self):
         self.ttl_inout.output()
         delay_mu(100)
-        with interleave:
+        with parallel:
             self.ttl_inout.gate_both_mu(1200)
             with sequential:
                 delay_mu(100)
diff --git a/artiq/test/coredevice/test_portability.py b/artiq/test/coredevice/test_portability.py
index e38921fa9..c1bce293b 100644
--- a/artiq/test/coredevice/test_portability.py
+++ b/artiq/test/coredevice/test_portability.py
@@ -100,7 +100,7 @@ class _Pulses(EnvExperiment):
     @kernel
     def run(self):
         for i in range(3):
-            with interleave:
+            with parallel:
                 with sequential:
                     self.a.pulse(100+i, 20*us)
                     self.b.pulse(200+i, 20*us)
diff --git a/artiq/test/coredevice/test_rtio.py b/artiq/test/coredevice/test_rtio.py
index 5167398eb..b99a2ecb0 100644
--- a/artiq/test/coredevice/test_rtio.py
+++ b/artiq/test/coredevice/test_rtio.py
@@ -16,7 +16,7 @@ class RTT(EnvExperiment):
     def run(self):
         self.ttl_inout.output()
         delay(1*us)
-        with interleave:
+        with parallel:
             # make sure not to send two commands into the same RTIO
             # channel with the same timestamp
             self.ttl_inout.gate_rising(5*us)
@@ -37,7 +37,7 @@ class Loopback(EnvExperiment):
     def run(self):
         self.loop_in.input()
         delay(1*us)
-        with interleave:
+        with parallel:
             self.loop_in.gate_rising(2*us)
             with sequential:
                 delay(1*us)
@@ -57,7 +57,7 @@ class ClockGeneratorLoopback(EnvExperiment):
         self.loop_clock_in.input()
         self.loop_clock_out.stop()
         delay(1*us)
-        with interleave:
+        with parallel:
             self.loop_clock_in.gate_rising(10*us)
             with sequential:
                 delay(200*ns)
@@ -110,7 +110,7 @@ class LoopbackCount(EnvExperiment):
     def run(self):
         self.ttl_inout.output()
         delay(5*us)
-        with interleave:
+        with parallel:
             self.ttl_inout.gate_rising(10*us)
             with sequential:
                 for i in range(self.npulses):