Author: danielsh
Date: Wed Feb 22 12:42:45 2012
New Revision: 1292260
URL: http://svn.apache.org/viewvc?rev=1292260&view=rev
Log:
Attempt to fix a test to not rely on a specific APR hash order. Similar
to r1292255.
* subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
(SubversionRepositoryTestCase.test_diff_dir_different_revs):
Allow any order for the actual values.
Modified:
subversion/trunk/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
Modified:
subversion/trunk/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py?rev=1292260&r1=1292259&r2=1292260&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
(original)
+++
subversion/trunk/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
Wed Feb 22 12:42:45 2012
@@ -264,16 +264,25 @@ class SubversionRepositoryTestCase(unitt
def test_diff_dir_different_revs(self):
diffs = self.repos.get_deltas('trunk', 4, 'trunk', 8)
- self._cmp_diff((None, ('trunk/dir1/dir2', 8),
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('trunk/dir1/dir3', 8),
- (Node.DIRECTORY, Changeset.ADD)), diffs.next())
- self._cmp_diff((None, ('trunk/README2.txt', 6),
- (Node.FILE, Changeset.ADD)), diffs.next())
- self._cmp_diff((('trunk/dir2', 4), None,
- (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
- self._cmp_diff((('trunk/dir3', 4), None,
- (Node.DIRECTORY, Changeset.DELETE)), diffs.next())
+ expected = [
+ (None, ('trunk/README2.txt', 6),
+ (Node.FILE, Changeset.ADD)),
+ (None, ('trunk/dir1/dir2', 8),
+ (Node.DIRECTORY, Changeset.ADD)),
+ (None, ('trunk/dir1/dir3', 8),
+ (Node.DIRECTORY, Changeset.ADD)),
+ (('trunk/dir2', 4), None,
+ (Node.DIRECTORY, Changeset.DELETE)),
+ (('trunk/dir3', 4), None,
+ (Node.DIRECTORY, Changeset.DELETE)),
+ ]
+ actual = [diffs.next() for i in range(5)]
+ actual = sorted(actual,
+ key=lambda diff: ((diff[0] or diff[1]).path,
+ (diff[0] or diff[1]).rev))
+ self.assertEqual(len(expected), len(actual))
+ for e,a in zip(expected, actual):
+ self._cmp_diff(e,a)
self.assertRaises(StopIteration, diffs.next)
def test_diff_dir_different_dirs(self):
