Refactor test to not use deprecated CXDirection (Qiskit#9877)

* Minimal repo for decorators breaking Pass Manager drawing * Refactor test to not use CXDirection * Get rid of maxDiff because of Pylint
ElePT · Apr 5, 2023 · 7dc9e44 · 7dc9e44
1 parent 4369a11
commit 7dc9e44
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/test/python/visualization/references/pass_manager_standard.dot b/test/python/visualization/references/pass_manager_standard.dot
@@ -70,18 +70,20 @@ subgraph cluster_20 {
 fontname=helvetica;
 label="[7] ";
 labeljust=l;
-21 [color=blue, fontname=helvetica, label=CXDirection, shape=rectangle];
+21 [color=blue, fontname=helvetica, label=GateDirection, shape=rectangle];
 22 [color=black, fontname=helvetica, fontsize=10, label=coupling_map, shape=ellipse, style=solid];
 22 -> 21;
+23 [color=black, fontname=helvetica, fontsize=10, label=target, shape=ellipse, style=dashed];
+23 -> 21;
 19 -> 21;
 }
 
-subgraph cluster_23 {
+subgraph cluster_24 {
 fontname=helvetica;
 label="[8] ";
 labeljust=l;
-24 [color=blue, fontname=helvetica, label=RemoveResetInZeroState, shape=rectangle];
-21 -> 24;
+25 [color=blue, fontname=helvetica, label=RemoveResetInZeroState, shape=rectangle];
+21 -> 25;
 }
 
 }
diff --git a/test/python/visualization/references/pass_manager_style.dot b/test/python/visualization/references/pass_manager_style.dot
@@ -70,18 +70,20 @@ subgraph cluster_20 {
 fontname=helvetica;
 label="[7] ";
 labeljust=l;
-21 [color=blue, fontname=helvetica, label=CXDirection, shape=rectangle];
+21 [color=blue, fontname=helvetica, label=GateDirection, shape=rectangle];
 22 [color=black, fontname=helvetica, fontsize=10, label=coupling_map, shape=ellipse, style=solid];
 22 -> 21;
+23 [color=black, fontname=helvetica, fontsize=10, label=target, shape=ellipse, style=dashed];
+23 -> 21;
 19 -> 21;
 }
 
-subgraph cluster_23 {
+subgraph cluster_24 {
 fontname=helvetica;
 label="[8] ";
 labeljust=l;
-24 [color=grey, fontname=helvetica, label=RemoveResetInZeroState, shape=rectangle];
-21 -> 24;
+25 [color=grey, fontname=helvetica, label=RemoveResetInZeroState, shape=rectangle];
+21 -> 25;
 }
 
 }
diff --git a/test/python/visualization/test_pass_manager_drawer.py b/test/python/visualization/test_pass_manager_drawer.py
@@ -18,9 +18,8 @@
 from qiskit.transpiler import CouplingMap, Layout
 from qiskit.transpiler.passmanager import PassManager
 from qiskit import QuantumRegister
-from qiskit.transpiler.passes import Unroller
+from qiskit.transpiler.passes import GateDirection, Unroller
 from qiskit.transpiler.passes import CheckMap
-from qiskit.transpiler.passes import CXDirection
 from qiskit.transpiler.passes import SetLayout
 from qiskit.transpiler.passes import TrivialLayout
 from qiskit.transpiler.passes import BarrierBeforeFinalMeasurements
@@ -52,7 +51,7 @@ def setUp(self):
         self.pass_manager.append(Unroller(basis_gates))
         self.pass_manager.append(CheckMap(coupling_map))
         self.pass_manager.append(BarrierBeforeFinalMeasurements(), do_while=lambda x: False)
-        self.pass_manager.append(CXDirection(coupling_map))
+        self.pass_manager.append(GateDirection(coupling_map))
         self.pass_manager.append(RemoveResetInZeroState())
 
     @unittest.skipIf(not optionals.HAS_GRAPHVIZ, "Graphviz not installed.")
@@ -61,8 +60,12 @@ def test_pass_manager_drawer_basic(self):
         filename = "current_standard.dot"
         self.pass_manager.draw(filename=filename, raw=True)
 
-        self.assertFilesAreEqual(filename, path_to_diagram_reference("pass_manager_standard.dot"))
-        os.remove(filename)
+        try:
+            self.assertFilesAreEqual(
+                filename, path_to_diagram_reference("pass_manager_standard.dot")
+            )
+        finally:
+            os.remove(filename)
 
     @unittest.skipIf(not optionals.HAS_GRAPHVIZ, "Graphviz not installed.")
     def test_pass_manager_drawer_style(self):
@@ -78,8 +81,10 @@ def test_pass_manager_drawer_style(self):
         filename = "current_style.dot"
         self.pass_manager.draw(filename=filename, style=style, raw=True)
 
-        self.assertFilesAreEqual(filename, path_to_diagram_reference("pass_manager_style.dot"))
-        os.remove(filename)
+        try:
+            self.assertFilesAreEqual(filename, path_to_diagram_reference("pass_manager_style.dot"))
+        finally:
+            os.remove(filename)
 
 
 if __name__ == "__main__":