35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
|
|
Remaining fixes for APR hashorder issues.
|
|
|
|
--- subversion-1.7.4/subversion/bindings/swig/python/tests/repository.py.hashorder
|
|
+++ subversion-1.7.4/subversion/bindings/swig/python/tests/repository.py
|
|
@@ -170,9 +170,11 @@ class SubversionRepositoryTestCase(unitt
|
|
repos.dir_delta(prev_root, '', '', this_root, '', e_ptr, e_baton,
|
|
_authz_callback, 1, 1, 0, 0)
|
|
|
|
- # Check results
|
|
- self.assertEqual(editor.textdeltas[0].new_data, "This is a test.\n")
|
|
- self.assertEqual(editor.textdeltas[1].new_data, "A test.\n")
|
|
+ # Check results.
|
|
+ # Ignore the order in which the editor delivers the two sibling files.
|
|
+ self.assertEqual(set([editor.textdeltas[0].new_data,
|
|
+ editor.textdeltas[1].new_data]),
|
|
+ set(["This is a test.\n", "A test.\n"]))
|
|
self.assertEqual(len(editor.textdeltas), 2)
|
|
|
|
def test_retrieve_and_change_rev_prop(self):
|
|
--- subversion-1.7.4/subversion/bindings/swig/python/tests/wc.py.hashorder
|
|
+++ subversion-1.7.4/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))
|