Skip to content

Commit 04780a5

Browse files
authored
Fix dominance tests (#1524)
* Fix dominance tests on HEAD * Flip side of subset * Fix last incompatible assertion * Black
1 parent 7a90fc5 commit 04780a5

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

tests/digraph/test_dominance.py

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ def test_singleton(self):
5757

5858
nx_graph = nx.DiGraph()
5959
nx_graph.add_edges_from(graph.edge_list())
60-
self.assertDictEqual(nx.immediate_dominators(nx_graph, 0), {0: 0})
60+
# subset check
61+
self.assertGreaterEqual(
62+
rx.immediate_dominators(graph, 0).items(), nx.immediate_dominators(nx_graph, 0).items()
63+
)
6164

6265
def test_irreducible1(self):
6366
"""
@@ -74,7 +77,8 @@ def test_irreducible1(self):
7477

7578
nx_graph = nx.DiGraph()
7679
nx_graph.add_edges_from(graph.edge_list())
77-
self.assertDictEqual(nx.immediate_dominators(nx_graph, 5), result)
80+
# subset check
81+
self.assertGreaterEqual(result.items(), nx.immediate_dominators(nx_graph, 5).items())
7882

7983
def test_irreducible2(self):
8084
"""
@@ -91,7 +95,8 @@ def test_irreducible2(self):
9195

9296
nx_graph = nx.DiGraph()
9397
nx_graph.add_edges_from(graph.edge_list())
94-
self.assertDictEqual(nx.immediate_dominators(nx_graph, 6), result)
98+
# subset check
99+
self.assertGreaterEqual(result.items(), nx.immediate_dominators(nx_graph, 6).items())
95100

96101
def test_domrel_png(self):
97102
"""
@@ -107,14 +112,17 @@ def test_domrel_png(self):
107112

108113
nx_graph = nx.DiGraph()
109114
nx_graph.add_edges_from(graph.edge_list())
110-
self.assertDictEqual(nx.immediate_dominators(nx_graph, 1), result)
115+
# subset check
116+
self.assertGreaterEqual(result.items(), nx.immediate_dominators(nx_graph, 1).items())
111117

112118
# Test postdominance.
113119
graph.reverse()
114120
result = rx.immediate_dominators(graph, 6)
115121
self.assertDictEqual(result, {1: 2, 2: 6, 3: 5, 4: 5, 5: 2, 6: 6})
116-
117-
self.assertDictEqual(nx.immediate_dominators(nx_graph.reverse(copy=False), 6), result)
122+
# subset check
123+
self.assertGreaterEqual(
124+
result.items(), nx.immediate_dominators(nx_graph.reverse(copy=False), 6).items()
125+
)
118126

119127
def test_boost_example(self):
120128
"""
@@ -129,14 +137,17 @@ def test_boost_example(self):
129137

130138
nx_graph = nx.DiGraph()
131139
nx_graph.add_edges_from(graph.edge_list())
132-
self.assertDictEqual(nx.immediate_dominators(nx_graph, 0), result)
140+
# subset check
141+
self.assertGreaterEqual(result.items(), nx.immediate_dominators(nx_graph, 0).items())
133142

134143
# Test postdominance.
135144
graph.reverse()
136145
result = rx.immediate_dominators(graph, 7)
137146
self.assertDictEqual(result, {0: 1, 1: 7, 2: 7, 3: 4, 4: 5, 5: 7, 6: 4, 7: 7})
138-
139-
self.assertDictEqual(nx.immediate_dominators(nx_graph.reverse(copy=False), 7), result)
147+
# subset check
148+
self.assertGreaterEqual(
149+
result.items(), nx.immediate_dominators(nx_graph.reverse(copy=False), 7).items()
150+
)
140151

141152

142153
class TestDominanceFrontiers(unittest.TestCase):

0 commit comments

Comments
 (0)