[Python-checkins] cpython (merge default -> default): merge heads
benjamin.peterson
python-checkins at python.org
Tue May 15 19:12:54 CEST 2012
http://hg.python.org/cpython/rev/ac39dc507f21
changeset: 76965:ac39dc507f21
parent: 76964:c18a1a82bb07
parent: 76963:f8b8babffd4d
user: Benjamin Peterson <benjamin at python.org>
date: Tue May 15 10:11:33 2012 -0700
summary:
merge heads
files:
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
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -711,6 +711,7 @@
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 @@
# 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"]))
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list