fix conflict

Qiskit · Dec 12, 2024 · 7f8cb05 · 7f8cb05
1 parent fd01133
commit 7f8cb05
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/test/python/qpy/test_circuit_load_from_qpy.py b/test/python/qpy/test_circuit_load_from_qpy.py
@@ -73,6 +73,14 @@ def assert_roundtrip_equal(self, circuit, version=None, use_symengine=None):
             self.assert_layout_equal(
                 circuit, circuit.layout.final_layout, new_circuit, new_circuit.layout.final_layout
             )
+        if version is not None:
+            qpy_file.seek(0)
+            file_version = struct.unpack("!6sB", qpy_file.read(7))[1]
+            self.assertEqual(
+                version,
+                file_version,
+                f"Generated QPY file version {file_version} does not match request version {version}",
+            )
 
 
 @ddt