Author: julianfoad
Date: Fri Nov 23 13:41:26 2018
New Revision: 1847264
URL: http://svn.apache.org/viewvc?rev=1847264&view=rev
Log:
In a test, restore ignoring the output order, following r1847181.
For issue SVN-4792: Foreign repo copy of file adding mergeinfo.
* subversion/tests/cmdline/copy_tests.py
(foreign_repos_to_wc): Restore the use of 'UnorderedOutput'.
Modified:
subversion/trunk/subversion/tests/cmdline/copy_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1847264&r1=1847263&r2=1847264&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Nov 23 13:41:26
2018
@@ -1073,13 +1073,13 @@ def foreign_repos_to_wc(sbox):
src_url = other_repo_url + '/A2/' + parent + '/' + name
src_url_resolved = src_url.replace('/A2/', '/A/')
- expected_output = [
+ expected_output = svntest.verify.UnorderedOutput([
'--- Copying from foreign repository URL \'%s\':\n' % src_url_resolved,
'A %s\n' % sbox.ospath(name),
] + [
'A %s\n' % sbox.ospath(name + '/' + child)
for child in children
- ]
+ ])
svntest.actions.run_and_verify_svn(expected_output, [],
'copy', '-r' + op_rev,
src_url + '@' + peg_rev,
