corrected failing tests

Author: boothby

dwave_networkx/generators/pegasus.py

@@ -338,12 +338,12 @@ def defect_free_pegasus(G):
     if family != PEGASUS:
         raise ValueError("G must be constructed by dwave_networkx.pegasus_graph")
 
-    offsets = eval(p.name.replace('pegasus_graph', ''))[1]
+    offsets = eval(G.name.replace('pegasus_graph', ''))[1]
     args = attrib['rows'],
     kwargs = {
         'offsets_index' if isinstance(offsets, int) else 'offset_lists': offsets,
         'coordinates': 'coordinate' == attrib['labels'],
-        'nice': 'nice' == attrib['labels'],
+        'nice_coordinates': 'nice' == attrib['labels'],
     }
 
     return pegasus_graph(*args, **kwargs)

tests/test_generator_chimera.py

@@ -376,13 +376,13 @@ def test_defect_free_chimera(self):
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertEqual(G, dnx.generators.chimera.defect_free_chimera(H))
+        self.assertTrue(nx.utils.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.assertEqual(G, dnx.generators.chimera.defect_free_chimera(H))
+        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.chimera.defect_free_chimera(H)))
 
 class TestChimeraTorus(unittest.TestCase):
     def test(self):

tests/test_generator_pegasus.py

@@ -407,19 +407,19 @@ def test_defect_free_pegasus(self):
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertEqual(G, dnx.generators.pegasus.defect_free_pegasus(H))
+        self.assertTrue(nx.utils.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.assertEqual(G, dnx.generators.pegasus.defect_free_pegasus(H))
+        self.assertTrue(nx.utils.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.assertEqual(G, dnx.generators.pegasus.defect_free_pegasus(H))
+        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.pegasus.defect_free_pegasus(H)))
 
 
 

tests/test_generator_zephyr.py

@@ -279,13 +279,13 @@ def test_defect_free_zephyr(self):
         H = G.copy()
         H.remove_nodes_from([*H][::3])
         H.remove_edges_from([*H.edges][::3])
-        self.assertEqual(G, dnx.generators.zephyr.defect_free_zephyr(H))
+        self.assertTrue(nx.utils.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.assertEqual(G, dnx.generators.zephyr.defect_free_zephyr(H))
+        self.assertTrue(nx.utils.graphs_equal(G, dnx.generators.zephyr.defect_free_zephyr(H)))
 
 class TestZephyrTorus(unittest.TestCase):
     def test(self):