summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2012-05-15 16:07:24 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2012-05-15 16:07:24 (GMT)
commitc5f31ed63d7db6f7e13112790d15a6274ca7c2cf (patch)
tree3ea639f421154a61af72ecb5aa4d497864a50509 /Lib
parent92a5bf0c0aae607da90bb08a01b7d06c4c8b45fe (diff)
parentc96f5a0457caea1757acdbac8626559542242b8c (diff)
downloadcpython-c5f31ed63d7db6f7e13112790d15a6274ca7c2cf.zip
cpython-c5f31ed63d7db6f7e13112790d15a6274ca7c2cf.tar.gz
cpython-c5f31ed63d7db6f7e13112790d15a6274ca7c2cf.tar.bz2
merge heads
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_os.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 1e0daf0..9a84ba1 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -695,6 +695,7 @@ class WalkTests(unittest.TestCase):
# flipped: TESTFN, SUB2, SUB1, SUB11
flipped = all[0][1][0] != "SUB1"
all[0][1].sort()
+ all[3 - 2 * flipped][-1].sort()
self.assertEqual(all[0], (walk_path, ["SUB1", "SUB2"], ["tmp1"]))
self.assertEqual(all[1 + flipped], (sub1_path, ["SUB11"], ["tmp2"]))
self.assertEqual(all[2 + flipped], (sub11_path, [], []))