subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1085523 - /subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
Date Fri, 25 Mar 2011 19:10:51 GMT
Author: cmpilato
Date: Fri Mar 25 19:10:51 2011
New Revision: 1085523

URL: http://svn.apache.org/viewvc?rev=1085523&view=rev
Log:
For issue #3844 ("svnrdump chokes on dumpfiles with multiple prop
edits to the same node"):  Make svnrdump_tests.py 38 PASS by driving
the binaries the right way.

* subversion/tests/cmdline/svnrdump_tests.py
  (run_load_test): Add 'expect_deltas' parameter, passed to
    run_and_verify_dump() to turn out a --deltas dump.
  (multi_prop_edit_load): Pass False for expect_deltas to
    run_load_test(), and remove @XFail decorator.

Modified:
    subversion/trunk/subversion/tests/cmdline/svnrdump_tests.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=1085523&r1=1085522&r2=1085523&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Fri Mar 25 19:10:51 2011
@@ -113,7 +113,8 @@ def run_dump_test(sbox, dumpfile_name, e
     "Dump files", "DUMP", svnadmin_dumpfile, svnrdump_dumpfile,
     None, mismatched_headers_re)
 
-def run_load_test(sbox, dumpfile_name, expected_dumpfile_name = None):
+def run_load_test(sbox, dumpfile_name, expected_dumpfile_name = None,
+                  expect_deltas = True):
   """Load a dumpfile using 'svnrdump load', dump it with 'svnadmin
   dump' and check that the same dumpfile is produced"""
 
@@ -146,7 +147,8 @@ def run_load_test(sbox, dumpfile_name, e
                                           sbox.repo_url)
 
   # Create a dump file using svnadmin dump
-  svnadmin_dumpfile = svntest.actions.run_and_verify_dump(sbox.repo_dir, True)
+  svnadmin_dumpfile = svntest.actions.run_and_verify_dump(sbox.repo_dir,
+                                                          expect_deltas)
 
   if expected_dumpfile_name:
     svnrdump_dumpfile = open(os.path.join(svnrdump_tests_dir,
@@ -333,11 +335,10 @@ def descend_into_replace_load(sbox):
   "load: descending into replaced dir looks in src"
   run_load_test(sbox, "descend-into-replace.dump")
 
-@XFail()
 @Issue(3844)
 def multi_prop_edit_load(sbox):
   "load: multiple prop edits on a file"
-  run_load_test(sbox, "multi-prop-edits.dump")
+  run_load_test(sbox, "multi-prop-edits.dump", None, False)
 
 
 ########################################################################



Mime
View raw message