diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-05-15 17:11:33 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-05-15 17:11:33 (GMT) |
| commit | f4ec88e45aff7db22f1a4783092edd9c604cf793 (patch) | |
| tree | 63cf5c2fda1cd23d8227aacca21b0ccfd66b62ef | |
| parent | 77fa9379e2fd9c074b4c002c0fd5d43caca80fff (diff) | |
| parent | 39bf90d31955055929e475085f20ea88ca3d3daf (diff) | |
| download | cpython-f4ec88e45aff7db22f1a4783092edd9c604cf793.zip cpython-f4ec88e45aff7db22f1a4783092edd9c604cf793.tar.gz cpython-f4ec88e45aff7db22f1a4783092edd9c604cf793.tar.bz2 | |
merge heads
| -rw-r--r-- | Lib/test/test_os.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 9a84ba1..9b29b37 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -711,6 +711,7 @@ class WalkTests(unittest.TestCase): dirs.remove('SUB1') self.assertEqual(len(all), 2) self.assertEqual(all[0], (walk_path, ["SUB2"], ["tmp1"])) + all[1][-1].sort() self.assertEqual(all[1], sub2_tree) # Walk bottom-up. @@ -721,6 +722,7 @@ class WalkTests(unittest.TestCase): # flipped: SUB2, SUB11, SUB1, TESTFN flipped = all[3][1][0] != "SUB1" all[3][1].sort() + all[2 - 2 * flipped][-1].sort() self.assertEqual(all[3], (walk_path, ["SUB1", "SUB2"], ["tmp1"])) self.assertEqual(all[flipped], (sub11_path, [], [])) self.assertEqual(all[flipped + 1], (sub1_path, ["SUB11"], ["tmp2"])) |