Fix tests again

Author: mtreinish

test/python/qpy/test_roundtrip.py

@@ -13,10 +13,11 @@
 """Tests for python write/rust read flow and vice versa"""
 
 import io
+import uuid
 
 from ddt import ddt, idata, unpack
 
-from qiskit.circuit import QuantumCircuit, QuantumRegister, ClassicalRegister
+from qiskit.circuit import QuantumCircuit, QuantumRegister, ClassicalRegister, Duration
 from qiskit.circuit.library import PauliEvolutionGate
 from qiskit.circuit.random import random_circuit
 from qiskit.circuit.parameter import Parameter
@@ -253,3 +254,12 @@ def test_delay_roundtrip(self, version, write_with, read_with):
         qc = QuantumCircuit(1)
         qc.delay(1, 0, "dt")
         self.assert_roundtrip_equal(qc, version=version, read_with=read_with, write_with=write_with)
+
+    @all_qpy_combinations(QPY_RUST_READ_MIN_VERSION)
+    def test_delay_expr_roundtrip(self, version, write_with, read_with):
+        stretch_expr = QuantumCircuit(1, name="stretch_expr_delay_circuit")
+        s = expr.Stretch(uuid.uuid4(), "a")
+        stretch = stretch_expr.add_stretch(s)
+        stretch_expr.delay(stretch, 0)
+        stretch_expr.delay(expr.add(Duration.dt(200), stretch), 0)
+        stretch_expr.delay(expr.sub(Duration.ns(3.14159), stretch), 0)

test/qpy_compat/test_qpy.py

@@ -944,7 +944,7 @@ def generate_box():
             nested.x(0)
             nested.noop(1)
 
-    labeled = QuantumCircuit(2)
+    labeled = QuantumCircuit(2, name="labeled boxes")
     with labeled.box():
         labeled.cx(0, 1)
     with labeled.box(duration=1, unit="dt", label="hello"):
@@ -965,15 +965,16 @@ def generate_delay():
 def generate_delay_stretch():
     """Circuits that contain a stretch delay. Added in QPY 14 in Qiskit 2.0."""
     from qiskit.circuit.classical import expr
+    from qiskit.circuit import Duration
     import uuid
 
-    stretch_expr = QuantumCircuit(name="stretch_expr")
+    stretch_expr = QuantumCircuit(1, name="stretch_expr_delay_circuit")
     s = expr.Stretch(uuid.UUID(bytes=b"hallo, QPY_world", version=4), "a")
     stretch = stretch_expr.add_stretch(s)
-    qc = QuantumCircuit(1)
-    qc.add_stretch(stretch)
-    qc.delay(stretch)
-    return [qc]
+    stretch_expr.delay(stretch, 0)
+    stretch_expr.delay(expr.add(Duration.dt(200), stretch), 1)
+    stretch_expr.delay(expr.sub(Duration.ns(3.14159), stretch), 0)
+    return [stretch_expr]
 
 
 def generate_circuits(generating_version, current_version, load_context=False):