Rev 4790: Quick fix for glob tests. in

John Arbash Meinel john at
Tue Nov 10 20:17:41 GMT 2009


revno: 4790
revision-id: john at
parent: pqm at
committer: John Arbash Meinel <john at>
branch nick: 2.1.0b3-glob-sorted
timestamp: Tue 2009-11-10 14:17:33 -0600
  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/'
--- a/bzrlib/tests/	2009-11-04 22:12:46 +0000
+++ b/bzrlib/tests/	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'])

More information about the bazaar-commits mailing list