fixed failing tests using old networkx

Author: boothby

tests/test_generator_chimera.py

@@ -17,6 +17,7 @@
 import networkx as nx
 import dwave_networkx as dnx
 import numpy as np
+from .common import graphs_equal
 
 alpha_map = dict(enumerate('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'))
 
@@ -376,13 +377,13 @@ def test_defect_free_chimera(self):
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.chimera.defect_free_chimera(H)))
+        self.assertTrue(graphs_equal(G, dnx.generators.chimera.defect_free_chimera(H)))
 
         G = dnx.chimera_graph(2, 4, 2, coordinates=True)
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.chimera.defect_free_chimera(H)))
+        self.assertTrue(graphs_equal(G, dnx.generators.chimera.defect_free_chimera(H)))
 
 class TestChimeraTorus(unittest.TestCase):
     def test(self):

tests/test_generator_pegasus.py

@@ -27,6 +27,8 @@
     get_tuple_fragmentation_fn,
     )
 
+from .common import graphs_equal
+
 alpha_map = dict(enumerate('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'))
 
 
@@ -407,19 +409,19 @@ def test_defect_free_pegasus(self):
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.pegasus.defect_free_pegasus(H)))
+        self.assertTrue(graphs_equal(G, dnx.generators.pegasus.defect_free_pegasus(H)))
 
         G = dnx.pegasus_graph(3, offsets_index=1, coordinates=True)
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.pegasus.defect_free_pegasus(H)))
+        self.assertTrue(graphs_equal(G, dnx.generators.pegasus.defect_free_pegasus(H)))
 
         G = dnx.pegasus_graph(3, nice_coordinates=True)
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.pegasus.defect_free_pegasus(H)))
+        self.assertTrue(graphs_equal(G, dnx.generators.pegasus.defect_free_pegasus(H)))
 
 
 

tests/test_generator_zephyr.py

@@ -17,6 +17,7 @@
 import networkx as nx
 import dwave_networkx as dnx
 import numpy as np
+from .common import graphs_equal
 
 class TestZephyrGraph(unittest.TestCase):
     def test_single_tile(self):
@@ -279,13 +280,13 @@ def test_defect_free_zephyr(self):
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.zephyr.defect_free_zephyr(H)))
+        self.assertTrue(graphs_equal(G, dnx.generators.zephyr.defect_free_zephyr(H)))
 
         G = dnx.zephyr_graph(2, 2, coordinates=True)
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.zephyr.defect_free_zephyr(H)))
+        self.assertTrue(graphs_equal(G, dnx.generators.zephyr.defect_free_zephyr(H)))
 
 class TestZephyrTorus(unittest.TestCase):
     def test(self):