Author: brane
Date: Fri Jun 12 04:33:29 2015
New Revision: 1685034
URL: http://svn.apache.org/r1685034
Log:
Follow up to r1684940: Fix svnadmin tests with FSFS versions prior to v7.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going_quiet): FSFSv7 has more checksum validations than
previous versions, so make the expected error list conditional on that.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1685034&r1=1685033&r2=1685034&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Jun 12
04:33:29 2015
@@ -2146,14 +2146,18 @@ def verify_keep_going_quiet(sbox):
"--quiet",
sbox.repo_dir)
- exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
- ".*Error verifying revision 2.",
+ exp_err = svntest.verify.RegexListOutput([".*Error verifying revision 2.",
"svnadmin: E160004:.*",
"svnadmin: E160004:.*",
".*Error verifying revision 3.",
"svnadmin: E160004:.*",
"svnadmin: E160004:.*",
"svnadmin: E165011:.*"], False)
+
+ # Insert another expected error from checksum verification
+ if (svntest.main.is_fs_log_addressing()):
+ exp_err.insert(0, "svnadmin: E160004:.*")
+
if svntest.verify.verify_outputs(
"Unexpected error while running 'svnadmin verify'.",
output, errput, None, exp_err):
