diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-10-28 14:14:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 23:14:37 +0200 |
| commit | 67a1abb6aab3b3ce40eb3fdc0af73179ab436a3a (patch) | |
| tree | 19492eedad62cf14fbed5f1956864db3ed335fe8 | |
| parent | d6623c3ddb9a0e5ffed81253bd40f75c3c662f1a (diff) | |
| download | cpython-git-67a1abb6aab3b3ce40eb3fdc0af73179ab436a3a.tar.gz | |
bpo-45624: make test_graphlib not depend on the iteration order of sets (GH-29233) (GH-29292)
the current test depended on integer sets being iterated on in a certain
fixed order. That order is different on PyPy (insertion based) and could
change in CPython in the future in theory. Make the test robust against
a different iteration order by sorting.
(cherry picked from commit 7401694807fc6b5f7b35ff73c06f4bb852e02946)
Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
| -rw-r--r-- | Lib/test/test_graphlib.py | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Lib/test/test_graphlib.py b/Lib/test/test_graphlib.py index 00432537f2..86246a62ed 100644 --- a/Lib/test/test_graphlib.py +++ b/Lib/test/test_graphlib.py @@ -13,13 +13,19 @@ class TestTopologicalSort(unittest.TestCase): nodes = ts.get_ready() for node in nodes: ts.done(node) - yield nodes + yield tuple(sorted(nodes)) ts = graphlib.TopologicalSorter(graph) self.assertEqual(list(static_order_with_groups(ts)), list(expected)) ts = graphlib.TopologicalSorter(graph) - self.assertEqual(list(ts.static_order()), list(chain(*expected))) + # need to be a bit careful comparing the result of ts.static_order and + # expected, because the order within a group is dependent on set + # iteration order + it = iter(ts.static_order()) + for group in expected: + tsgroup = {next(it) for element in group} + self.assertEqual(set(group), tsgroup) def _assert_cycle(self, graph, cycle): ts = graphlib.TopologicalSorter() @@ -36,7 +42,7 @@ class TestTopologicalSort(unittest.TestCase): def test_simple_cases(self): self._test_graph( {2: {11}, 9: {11, 8}, 10: {11, 3}, 11: {7, 5}, 8: {7, 3}}, - [(3, 5, 7), (11, 8), (2, 10, 9)], + [(3, 5, 7), (8, 11), (2, 9, 10)], ) self._test_graph({1: {}}, [(1,)]) @@ -80,7 +86,7 @@ class TestTopologicalSort(unittest.TestCase): def test_the_node_multiple_times(self): # Test same node multiple times in dependencies - self._test_graph({1: {2}, 3: {4}, 0: [2, 4, 4, 4, 4, 4]}, [(2, 4), (1, 3, 0)]) + self._test_graph({1: {2}, 3: {4}, 0: [2, 4, 4, 4, 4, 4]}, [(2, 4), (0, 1, 3)]) # Test adding the same dependency multiple times ts = graphlib.TopologicalSorter() @@ -242,3 +248,6 @@ class TestTopologicalSort(unittest.TestCase): self.assertNotEqual(run1, "") self.assertNotEqual(run2, "") self.assertEqual(run1, run2) + +if __name__ == "__main__": + unittest.main() |