NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit7401694

authored

bpo-45624: make test_graphlib not depend on the iteration order of sets (pythonGH-29233)

the current test depended on integer sets being iterated on in a certainfixed order. That order is different on PyPy (insertion based) and couldchange in CPython in the future in theory. Make the test robust againsta different iteration order by sorting.

1 parent03db1bb commit7401694Copy full SHA for 7401694

File tree

1 file changed

+13

-4

lines changed

Lib/test
- test_graphlib.py

1 file changed

+13

-4

lines changed

`‎Lib/test/test_graphlib.py‎`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,19 @@ def static_order_with_groups(ts):`
`13`	`13`	`nodes=ts.get_ready()`
`14`	`14`	`fornodeinnodes:`
`15`	`15`	`ts.done(node)`
`16`		`-yieldnodes`
	`16`	`+yieldtuple(sorted(nodes))`
`17`	`17`
`18`	`18`	`ts=graphlib.TopologicalSorter(graph)`
`19`	`19`	`self.assertEqual(list(static_order_with_groups(ts)),list(expected))`
`20`	`20`
`21`	`21`	`ts=graphlib.TopologicalSorter(graph)`
`22`		`-self.assertEqual(list(ts.static_order()),list(chain(*expected)))`
	`22`	`+# need to be a bit careful comparing the result of ts.static_order and`
	`23`	`+# expected, because the order within a group is dependent on set`
	`24`	`+# iteration order`
	`25`	`+it=iter(ts.static_order())`
	`26`	`+forgroupinexpected:`
	`27`	`+tsgroup= {next(it)forelementingroup}`
	`28`	`+self.assertEqual(set(group),tsgroup)`
`23`	`29`
`24`	`30`	`def_assert_cycle(self,graph,cycle):`
`25`	`31`	`ts=graphlib.TopologicalSorter()`
`@@ -36,7 +42,7 @@ def _assert_cycle(self, graph, cycle):`
`36`	`42`	`deftest_simple_cases(self):`
`37`	`43`	`self._test_graph(`
`38`	`44`	`{2: {11},9: {11,8},10: {11,3},11: {7,5},8: {7,3}},`
`39`		`- [(3,5,7), (11,8), (2,10,9)],`
	`45`	`+ [(3,5,7), (8,11), (2,9,10)],`
`40`	`46`	`)`
`41`	`47`
`42`	`48`	`self._test_graph({1: {}}, [(1,)])`
`@@ -80,7 +86,7 @@ def test_no_dependencies(self):`
`80`	`86`
`81`	`87`	`deftest_the_node_multiple_times(self):`
`82`	`88`	`# Test same node multiple times in dependencies`
`83`		`-self._test_graph({1: {2},3: {4},0: [2,4,4,4,4,4]}, [(2,4), (1,3,0)])`
	`89`	`+self._test_graph({1: {2},3: {4},0: [2,4,4,4,4,4]}, [(2,4), (0,1,3)])`
`84`	`90`
`85`	`91`	`# Test adding the same dependency multiple times`
`86`	`92`	`ts=graphlib.TopologicalSorter()`
`@@ -242,3 +248,6 @@ def check_order_with_hash_seed(seed):`
`242`	`248`	`self.assertNotEqual(run1,"")`
`243`	`249`	`self.assertNotEqual(run2,"")`
`244`	`250`	`self.assertEqual(run1,run2)`
	`251`	`+`
	`252`	`+if__name__=="__main__":`
	`253`	`+unittest.main()`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7401694

File tree

1 file changed

1 file changed

`‎Lib/test/test_graphlib.py‎`

0 commit comments