Fix RNG-related tests

Qiskit · Feb 9, 2023 · 254fc51 · 254fc51
1 parent 0db3ac3
commit 254fc51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 37 deletions.
diff --git a/test/python/qasm/TestsSabreSwap_handle_measurement.qasm b/test/python/qasm/TestsSabreSwap_handle_measurement.qasm
@@ -8,7 +8,7 @@ measure q[2] -> c[2];
 swap q[2],q[3];
 cx q[2],q[1];
 measure q[1] -> c[1];
-swap q[1],q[2];
-cx q[1],q[0];
-measure q[0] -> c[0];
-measure q[1] -> c[3];
+swap q[0],q[1];
+cx q[2],q[1];
+measure q[1] -> c[0];
+measure q[2] -> c[3];
diff --git a/test/python/transpiler/test_sabre_layout.py b/test/python/transpiler/test_sabre_layout.py
@@ -59,11 +59,7 @@ def test_5q_circuit_20q_coupling(self):
         pass_.run(dag)
 
         layout = pass_.property_set["layout"]
-        self.assertEqual(layout[qr[0]], 18)
-        self.assertEqual(layout[qr[1]], 11)
-        self.assertEqual(layout[qr[2]], 13)
-        self.assertEqual(layout[qr[3]], 12)
-        self.assertEqual(layout[qr[4]], 14)
+        self.assertEqual([layout[q] for q in circuit.qubits], [18, 11, 13, 12, 14])
 
     def test_6q_circuit_20q_coupling(self):
         """Test finds layout for 6q circuit on 20q device."""
@@ -95,12 +91,7 @@ def test_6q_circuit_20q_coupling(self):
         pass_.run(dag)
 
         layout = pass_.property_set["layout"]
-        self.assertEqual(layout[qr0[0]], 12)
-        self.assertEqual(layout[qr0[1]], 7)
-        self.assertEqual(layout[qr0[2]], 14)
-        self.assertEqual(layout[qr1[0]], 11)
-        self.assertEqual(layout[qr1[1]], 18)
-        self.assertEqual(layout[qr1[2]], 13)
+        self.assertEqual([layout[q] for q in circuit.qubits], [7, 8, 12, 6, 11, 13])
 
     def test_layout_with_classical_bits(self):
         """Test sabre layout with classical bits recreate from issue #8635."""
@@ -132,14 +123,9 @@ def test_layout_with_classical_bits(self):
         res = transpile(qc, FakeKolkata(), layout_method="sabre", seed_transpiler=1234)
         self.assertIsInstance(res, QuantumCircuit)
         layout = res._layout.initial_layout
-        self.assertEqual(layout[qc.qubits[0]], 11)
-        self.assertEqual(layout[qc.qubits[1]], 22)
-        self.assertEqual(layout[qc.qubits[2]], 21)
-        self.assertEqual(layout[qc.qubits[3]], 19)
-        self.assertEqual(layout[qc.qubits[4]], 26)
-        self.assertEqual(layout[qc.qubits[5]], 8)
-        self.assertEqual(layout[qc.qubits[6]], 17)
-        self.assertEqual(layout[qc.qubits[7]], 1)
+        self.assertEqual(
+            [layout[q] for q in qc.qubits], [13, 10, 11, 12, 17, 14, 22, 26, 5, 16, 25, 19, 7, 8]
+        )
 
     # pylint: disable=line-too-long
     def test_layout_many_search_trials(self):
@@ -193,20 +179,9 @@ def test_layout_many_search_trials(self):
         )
         self.assertIsInstance(res, QuantumCircuit)
         layout = res._layout.initial_layout
-        self.assertEqual(layout[qc.qubits[0]], 19)
-        self.assertEqual(layout[qc.qubits[1]], 10)
-        self.assertEqual(layout[qc.qubits[2]], 1)
-        self.assertEqual(layout[qc.qubits[3]], 14)
-        self.assertEqual(layout[qc.qubits[4]], 4)
-        self.assertEqual(layout[qc.qubits[5]], 11)
-        self.assertEqual(layout[qc.qubits[6]], 8)
-        self.assertEqual(layout[qc.qubits[7]], 7)
-        self.assertEqual(layout[qc.qubits[8]], 9)
-        self.assertEqual(layout[qc.qubits[9]], 0)
-        self.assertEqual(layout[qc.qubits[10]], 5)
-        self.assertEqual(layout[qc.qubits[11]], 13)
-        self.assertEqual(layout[qc.qubits[12]], 2)
-        self.assertEqual(layout[qc.qubits[13]], 3)
+        self.assertEqual(
+            [layout[q] for q in qc.qubits], [22, 21, 4, 12, 1, 23, 16, 18, 19, 25, 14, 13, 10, 7]
+        )
 
 
 if __name__ == "__main__":