Rev 4794: (jam) Fix glob tests order-related failures in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4794 [merge]
revision-id: pqm at pqm.ubuntu.com-20091112003735-0e7h1y9j2fo0kbnv
parent: pqm at pqm.ubuntu.com-20091111234944-3qg63sv4d66bs2z8
parent: v.ladeuil+lp at free.fr-20091111040333-ndbj242uqv3cviz7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-11-12 00:37:35 +0000
message:
  (jam) Fix glob tests order-related failures
modified:
  bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
=== modified file 'bzrlib/tests/test_win32utils.py'
--- a/bzrlib/tests/test_win32utils.py	2009-11-06 10:00:10 +0000
+++ b/bzrlib/tests/test_win32utils.py	2009-11-11 04:03:33 +0000
@@ -327,7 +327,10 @@
 class Test_CommandLineToArgv(tests.TestCaseInTempDir):
 
     def assertCommandLine(self, expected, line):
-        self.assertEqual(expected, win32utils._command_line_to_argv(line))
+        # Strictly speaking we should respect parameter order versus glob
+        # expansions, but it's not really worth the effort here
+        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'])