You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/03/24 17:30:19 UTC
svn commit: r1668928 -
/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
Author: julianfoad
Date: Tue Mar 24 16:30:19 2015
New Revision: 1668928
URL: http://svn.apache.org/r1668928
Log:
On the 'move-tracking-2' branch: Tweak the test infrastructure.
* subversion/tests/cmdline/svnmover_tests.py
(xtest_svnmover): Check there's an error even if no expression is supplied.
Modified:
subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py?rev=1668928&r1=1668927&r2=1668928&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/svnmover_tests.py Tue Mar 24 16:30:19 2015
@@ -128,7 +128,9 @@ def test_svnmover(repo_url, expected_pat
def xtest_svnmover(repo_url, error_re_string, *varargs):
"""Run svnmover with the list of VARARGS arguments. Verify that
- its run produces an error that matches ERROR_RE_STRING."""
+ its run produces an error, and that the error matches ERROR_RE_STRING
+ if that is not None.
+ """
# First, run svnmover.
exit_code, outlines, errlines = svntest.main.run_svnmover('-U', repo_url,
@@ -136,8 +138,11 @@ def xtest_svnmover(repo_url, error_re_st
if error_re_string:
if not error_re_string.startswith(".*"):
error_re_string = ".*(" + error_re_string + ")"
- expected_err = svntest.verify.RegexOutput(error_re_string, match_all=False)
- svntest.verify.verify_outputs(None, None, errlines, None, expected_err)
+ else:
+ error_re_string = ".*"
+
+ expected_err = svntest.verify.RegexOutput(error_re_string, match_all=False)
+ svntest.verify.verify_outputs(None, None, errlines, None, expected_err)
######################################################################