subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1607377 - in /subversion/trunk/subversion/tests/cmdline: svnadmin_tests.py svntest/verify.py
Date Wed, 02 Jul 2014 14:32:33 GMT
Author: stefan2
Date: Wed Jul  2 14:32:32 2014
New Revision: 1607377

URL: http://svn.apache.org/r1607377
Log:
Revert r1606902. This fixes the regression tests.

The original change had been made for a feature that is
now disabled in the svnadmin default config.

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=1607377&r1=1607376&r2=1607377&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Wed Jul  2 14:32:32 2014
@@ -2089,23 +2089,11 @@ def verify_keep_going(sbox):
                                             ".*Error verifying revision 2.",
                                             ".*Error verifying revision 3.",
                                             ".*",
-                                            ".*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:.*"])
+                                            ".*Summary.*",
+                                            ".*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=1607377&r1=1607376&r2=1607377&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Wed Jul  2 14:32:32 2014
@@ -258,10 +258,6 @@ 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.



Mime
View raw message