further hash order fix from upstream

This commit is contained in:
Joe Orton 2012-02-28 16:45:12 +00:00
parent a6a338f92a
commit 51d0a3b38f
1 changed files with 15 additions and 1 deletions

View File

@ -6,11 +6,11 @@ http://svn.apache.org/viewvc?rev=1293812&view=rev
trunk:
http://svn.apache.org/viewvc?rev=1292248&view=rev
http://svn.apache.org/viewvc?rev=1292260&view=rev
http://svn.apache.org/viewvc?rev=1292296&view=rev
http://svn.apache.org/viewvc?rev=1292322&view=rev
--- subversion-1.7.3/subversion/bindings/swig/python/tests/repository.py.hashorder
+++ subversion-1.7.3/subversion/bindings/swig/python/tests/repository.py
@@ -170,9 +170,11 @@ class SubversionRepositoryTestCase(unitt
@ -101,6 +101,20 @@ http://svn.apache.org/viewvc?rev=1292322&view=rev
self.assertRaises(StopIteration, diffs.next)
def test_diff_dir_no_change(self):
--- subversion-1.7.3/subversion/bindings/swig/python/tests/wc.py.hashorder
+++ subversion-1.7.3/subversion/bindings/swig/python/tests/wc.py
@@ -216,8 +216,9 @@ class SubversionWorkingCopyTestCase(unit
def test_entries_read(self):
entries = wc.entries_read(self.wc, True)
-
- self.assertEqual(['', 'tags', 'branches', 'trunk'], list(entries.keys()))
+ keys = list(entries.keys())
+ keys.sort()
+ self.assertEqual(['', 'branches', 'tags', 'trunk'], keys)
def test_get_ignores(self):
self.assert_(isinstance(wc.get_ignores(None, self.wc), list))
--- subversion-1.7.3/subversion/tests/cmdline/diff_tests.py.hashorder
+++ subversion-1.7.3/subversion/tests/cmdline/diff_tests.py
@@ -1165,8 +1165,10 @@ def diff_base_to_repos(sbox):