svn commit: r1063593 - in /subversion/trunk/subversion/tests/cmdline: svnrdump_tests.py svntest/verify.py

[da...@apache.org]

Author: danielsh
Date: Wed Jan 26 03:33:43 2011
New Revision: 1063593

URL: http://svn.apache.org/viewvc?rev=1063593&view=rev
Log:
Fix svnrdump_tests 35.

* subversion/tests/cmdline/svnrdump_tests.py
  (re): Import.
  (mismatched_headers_re): Now a compiled regex object.
  (run_dump_test): Expected unordered dumpfile lines.
  (test_list): Expect descend_into_replace_dump() to pass unconditionally.

* subversion/tests/cmdline/svntest/verify.py
  (UnorderedOutput.matches_except):
    Add specialized implementation for this subclass.

Modified:
    subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
    subversion/trunk/subversion/tests/cmdline/svntest/verify.py

Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1063593&r1=1063592&r2=1063593&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Wed Jan 26 03:33:43 2011
@@ -26,6 +26,7 @@
 
 # General modules
 import sys, os
+import re
 
 # Our testing module
 import svntest
@@ -49,9 +50,10 @@ Wimp = svntest.testcase.Wimp
 # /dev/null). This is really harmless, but `svnadmin dump` contains
 # the logic for differentiating between these two cases.
 
-mismatched_headers_re = \
-    "Prop-delta: |Text-content-sha1: |Text-copy-source-md5: |" \
-    "Text-copy-source-sha1: |Text-delta-base-sha1: .*"
+mismatched_headers_re = re.compile(
+    "Prop-delta: .*|Text-content-sha1: .*|Text-copy-source-md5: .*|" 
+    "Text-copy-source-sha1: .*|Text-delta-base-sha1: .*"
+)
 
 ######################################################################
 # Helper routines
@@ -102,6 +104,7 @@ def run_dump_test(sbox, dumpfile_name, e
     svnadmin_dumpfile = open(os.path.join(svnrdump_tests_dir,
                                           expected_dumpfile_name),
                              'rb').readlines()
+    svnadmin_dumpfile = svntest.verify.UnorderedOutput(svnadmin_dumpfile)
 
   # Compare the output from stdout
   svntest.verify.compare_and_display_lines(
@@ -362,7 +365,7 @@ test_list = [ None,
               copy_bad_line_endings_dump,
               commit_a_copy_of_root_dump,
               commit_a_copy_of_root_load,
-              XFail(descend_into_replace_dump, svntest.main.is_fs_type_bdb),
+              descend_into_replace_dump,
               descend_into_replace_load,
              ]
 

Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1063593&r1=1063592&r2=1063593&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Wed Jan 26 03:33:43 2011
@@ -238,6 +238,11 @@ class UnorderedOutput(ExpectedOutput):
   def __cmp__(self, other):
     raise Exception('badness')
 
+  def matches_except(self, expected, actual, except_re):
+    assert type(actual) == type([]) # ### if this trips: fix it!
+    return self.is_equivalent_list([l for l in expected if not except_re.match(l)],
+                                   [l for l in actual if not except_re.match(l)])
+
   def is_equivalent_list(self, expected, actual):
     "Disregard the order of ACTUAL lines during comparison."