diff tests/test_push_renames.py @ 1323:6fd0ec01553b stable

Merge to stable for release.
author Augie Fackler <raf@durin42.com>
date Tue, 05 May 2015 14:09:43 -0400
parents a36e87ae2380
children
line wrap: on
line diff
--- a/tests/test_push_renames.py
+++ b/tests/test_push_renames.py
@@ -66,8 +66,8 @@ class TestPushRenames(test_util.TestBase
             ]
         self.commitchanges(changes)
         self.pushrevisions()
-        self.assertEqual(self.repo['tip'].manifest().keys(),
-                         ['a', 'c', 'b', 'e', 'd',
+        self.assertEqual(sorted(self.repo['tip'].manifest().keys()),
+                         ['a', 'b', 'c', 'd', 'e',
                           'random2/dir with space/file with space'])
 
     def test_push_rename_tree(self):