Rev 4790: Quick fix for glob tests. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b3-glob-sorted

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b3-glob-sorted

------------------------------------------------------------
revno: 4790
revision-id: john at arbash-meinel.com-20091110201733-ggw1694si2kqzajv
parent: pqm at pqm.ubuntu.com-20091106084512-t5ll6xywcd1bycfe
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b3-glob-sorted
timestamp: Tue 2009-11-10 14:17:33 -0600
message:
  Quick fix for glob tests.
  
  It turns out that some filesystems (Vincent's build-bot) will return
  the glob in strange orders. It is *allowed* by the filesystem not
  to glob in sorted order, so we should sort afterwards.
  This isn't strictly true if we had 'b/* a/*', then it shouldn't
  return b after a, but for our testing we never try that, and it makes
  life easier.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_win32utils.py'
--- a/bzrlib/tests/test_win32utils.py	2009-11-04 22:12:46 +0000
+++ b/bzrlib/tests/test_win32utils.py	2009-11-10 20:17:33 +0000
@@ -329,7 +329,8 @@
 class Test_CommandLineToArgv(tests.TestCaseInTempDir):
 
     def assertCommandLine(self, expected, line):
-        self.assertEqual(expected, win32utils._command_line_to_argv(line))
+        self.assertEqual(expected,
+                         sorted(win32utils._command_line_to_argv(line)))
 
     def test_glob_paths(self):
         self.build_tree(['a/', 'a/b.c', 'a/c.c', 'a/c.h'])