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 2014/06/30 22:01:08 UTC
svn commit: r1606902 - in /subversion/trunk/subversion/tests/cmdline:
svnadmin_tests.py svntest/verify.py
Author: stefan2
Date: Mon Jun 30 20:01:08 2014
New Revision: 1606902
URL: http://svn.apache.org/r1606902
Log:
Follow-up to r1606840: Update another svnadmin verify check.
* subversion/tests/cmdline/svnadmin_tests.py
(verify_keep_going): Expect separate output for repos with low-level
checksum checks vs. those without.
* subversion/tests/cmdline/svntest/verify.py
(RegexListOutput.extend): Add trivial new method.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/verify.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=1606902&r1=1606901&r2=1606902&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Jun 30 20:01:08 2014
@@ -2089,11 +2089,23 @@ def verify_keep_going(sbox):
".*Error verifying revision 2.",
".*Error verifying revision 3.",
".*",
- ".*Summary.*",
- ".*r2: E160004:.*",
- ".*r2: E160004:.*",
- ".*r3: E160004:.*",
- ".*r3: E160004:.*"])
+ ".*Summary.*"])
+ if (svntest.main.is_fs_log_addressing()):
+ exp_out.extend([".*r2: E200014:.*",
+ ".*meta data at offset.*",
+ ".*expected.*",
+ ".*actual.*",
+ ".*",
+ ".*r3: E200014:.*",
+ ".*meta data at offset.*",
+ ".*expected.*",
+ ".*actual.*",
+ ".*"])
+ else:
+ exp_out.extend([".*r2: E160004:.*",
+ ".*r2: E160004:.*",
+ ".*r3: E160004:.*",
+ ".*r3: E160004:.*"])
exp_err = svntest.verify.RegexListOutput(["svnadmin: E160004:.*",
"svnadmin: E165011:.*"], False)
Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1606902&r1=1606901&r2=1606902&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Mon Jun 30 20:01:08 2014
@@ -258,6 +258,10 @@ class RegexListOutput(ExpectedOutput):
self.expected.insert(index, line)
self.expected_res = [re.compile(e) for e in self.expected]
+ def extend(self, list):
+ self.expected.extend(list)
+ self.expected_res = [re.compile(e) for e in self.expected]
+
class UnorderedOutput(ExpectedOutput):
"""Matches an unordered list of lines.