Author: troycurtisjr
Date: Thu Nov 23 01:29:56 2017
New Revision: 1816097
URL: http://svn.apache.org/viewvc?rev=1816097&view=rev
Log:
On branch swig-py3: Sort lists generated from dictionaries before testing.
* subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
(SubversionRepositoryTestCase.test_get_dir_entries,
SubversionRepositoryTestCase.test_changeset_added_dirs,
SubversionRepositoryTestCase.test_changset_dir_moves):
Wrap sequences in sorted() which are generated from dictionaries and used
for equivalence
tests to ensure consistent test returns.
Modified:
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
Modified:
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py?rev=1816097&r1=1816096&r2=1816097&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
(original)
+++
subversion/branches/swig-py3/subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py
Thu Nov 23 01:29:56 2017
@@ -152,10 +152,10 @@ class SubversionRepositoryTestCase(unitt
def test_get_dir_entries(self):
node = self.repos.get_node('/trunk')
entries = node.get_entries()
- self.assertSequenceEqual([entry.name for entry in entries],
- ['README2.txt',
+ self.assertSequenceEqual(sorted([entry.name for entry in entries]),
+ sorted(['README2.txt',
'dir1',
- 'README.txt'])
+ 'README.txt']))
def test_get_file_entries(self):
node = self.repos.get_node('/trunk/README.txt')
@@ -330,10 +330,10 @@ class SubversionRepositoryTestCase(unitt
self.assertEqual(1112349652, chgset.date)
changes = chgset.get_changes()
- self.assertSequenceEqual([x for x in changes],
- [('trunk', Node.DIRECTORY, Changeset.ADD, None, -1),
- ('branches', Node.DIRECTORY, Changeset.ADD, None, -1),
- ('tags', Node.DIRECTORY, Changeset.ADD, None, -1)])
+ self.assertSequenceEqual(sorted([x for x in changes]),
+ sorted([('trunk', Node.DIRECTORY, Changeset.ADD, None, -1),
+ ('branches', Node.DIRECTORY, Changeset.ADD, None, -1),
+ ('tags', Node.DIRECTORY, Changeset.ADD, None, -1)]))
def test_changeset_file_edit(self):
chgset = self.repos.get_changeset(3)
@@ -355,9 +355,10 @@ class SubversionRepositoryTestCase(unitt
self.assertEqual(1112372739, chgset.date)
changes = chgset.get_changes()
- self.assertSequenceEqual([x for x in changes],
- [('trunk/dir1/dir2', Node.DIRECTORY, Changeset.MOVE, 'trunk/dir2',
4),
- ('trunk/dir1/dir3', Node.DIRECTORY, Changeset.MOVE, 'trunk/dir3',
4)])
+ self.assertSequenceEqual(sorted([x for x in changes]),
+ sorted([
+ ('trunk/dir1/dir2', Node.DIRECTORY, Changeset.MOVE, 'trunk/dir2',
4),
+ ('trunk/dir1/dir3', Node.DIRECTORY, Changeset.MOVE, 'trunk/dir3',
4)]))
def test_changeset_file_copy(self):
chgset = self.repos.get_changeset(6)
