You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2012/02/29 17:25:12 UTC
svn commit: r1295180 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Author: hwright
Date: Wed Feb 29 16:25:12 2012
New Revision: 1295180
URL: http://svn.apache.org/viewvc?rev=1295180&view=rev
Log:
Fix failing merge test with Ev2 by using UnorderedOutput.
Current number of failing Ev2 tests: 4
* subversion/tests/cmdline/merge_tests.py
(merge_range_prior_to_rename_source_existence): Don't rely on output ordering.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1295180&r1=1295179&r2=1295180&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Feb 29 16:25:12 2012
@@ -14124,11 +14124,13 @@ def merge_range_prior_to_rename_source_e
'move', sbox.repo_url + '/A/D/H/nu',
sbox.repo_url + '/A/D/H/nu_moved',
'-m', 'Move nu to nu_moved')
- svntest.actions.run_and_verify_svn(None,
- ["Updating '%s':\n" % (wc_dir),
- "D " + nu_path + "\n",
- "A " + nu_moved_path + "\n",
- "Updated to revision 12.\n"],
+ expected_output = svntest.verify.UnorderedOutput(
+ ["Updating '%s':\n" % (wc_dir),
+ "D " + nu_path + "\n",
+ "A " + nu_moved_path + "\n",
+ "Updated to revision 12.\n"],
+ )
+ svntest.actions.run_and_verify_svn(None, expected_output,
[], 'up', wc_dir)
# Now merge -r7:12 from A to A_COPY.