You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/11/27 15:46:51 UTC
svn commit: r1546052 -
/subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Author: stsp
Date: Wed Nov 27 14:46:50 2013
New Revision: 1546052
URL: http://svn.apache.org/r1546052
Log:
On the verify-keep-going branch, adjust expected output to make tests pass.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going, verify_invalid_path_changes): Tweak expected stdout
and stderr to make these tests accept the current behaviour.
Modified:
subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py?rev=1546052&r1=1546051&r2=1546052&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/verify-keep-going/subversion/tests/cmdline/svnadmin_tests.py Wed Nov 27 14:46:50 2013
@@ -1897,7 +1897,9 @@ def verify_keep_going(sbox):
".*Error verifying revision 3.",
".*",
".*Summary.*",
- ".*E160004:.*"])
+ ".*r2: E160004:.*",
+ ".*r3: E160004:.*",
+ ".*r3: E160004:.*"])
exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
"svnadmin: E165011:.*"], False)
@@ -2009,10 +2011,28 @@ def verify_invalid_path_changes(sbox):
".*Error verifying revision 16.",
".*Verified revision 17.",
".*Error verifying revision 18.",
- ".*Verified revision 19."])
+ ".*Verified revision 19.",
+ ".*",
+ ".*Summary.*",
+ ".*r2: E160020:.*",
+ ".*r2: E160020:.*",
+ ".*r4: E160013:.*",
+ ".*r6: E160013:.*",
+ ".*r6: E160013:.*",
+ ".*r10: E160013:.*",
+ ".*r10: E160013:.*",
+ ".*r12: E145001:.*",
+ ".*r12: E145001:.*",
+ ".*r14: E160013:.*",
+ ".*r14: E160013:.*",
+ ".*r16: E145001:.*",
+ ".*r16: E145001:.*",
+ ".*r18: E160013:.*",
+ ".*r18: E160013:.*"])
exp_err = svntest.verify.RegexListOutput(["svnadmin: E160020:.*",
- "svnadmin: E165011:.*"], False)
+ "svnadmin: E145001:.*",
+ "svnadmin: E160013:.*"], False)
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
@@ -2027,6 +2047,9 @@ def verify_invalid_path_changes(sbox):
".*Verified revision 1.",
".*Error verifying revision 2."])
+ exp_err = svntest.verify.RegexListOutput(["svnadmin: E160020:.*",
+ "svnadmin: E165011:.*"], False)
+
if svntest.verify.verify_outputs("Unexpected error while running 'svnadmin verify'.",
output, errput, exp_out, exp_err):
raise svntest.Failure