From: Hynek Schlawack <hs@ox.cx>
Date: Tue, 15 May 2012 15:55:38 +0000 (+0200)
Subject: Sort file list in test_os.WalkTests
X-Git-Tag: v3.3.0a4~155^2~4^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c96f5a0457caea1757acdbac8626559542242b8c;p=python

Sort file list in test_os.WalkTests

Adding new files into the tree lead to buildbot fails as the order wasn't
deterministic.
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 1e0daf0855..9a84ba1787 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, [], []))
diff --git a/Misc/NEWS b/Misc/NEWS
index c79713fa68..48709799e3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,12 +31,12 @@ Core and Builtins
 Library
 -------
 
-- Issue 14773: Fix os.fwalk() failing on dangling symlinks.
+- Issue #14773: Fix os.fwalk() failing on dangling symlinks.
 
 - Issue #12541: Be lenient with quotes around Realm field of HTTP Basic
   Authentation in urllib2.
 
-- Issue 14807: move undocumented tarfile.filemode() to stat.filemode() and add
+- Issue #14807: move undocumented tarfile.filemode() to stat.filemode() and add
   doc entry. Add tarfile.filemode alias with deprecation warning.
 
 - Issue #13815: TarFile.extractfile() now returns io.BufferedReader objects.