Return-Path: Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: (qmail 27558 invoked from network); 25 Mar 2011 19:11:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Mar 2011 19:11:13 -0000 Received: (qmail 64370 invoked by uid 500); 25 Mar 2011 19:11:13 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 64344 invoked by uid 500); 25 Mar 2011 19:11:13 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 64337 invoked by uid 99); 25 Mar 2011 19:11:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Mar 2011 19:11:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Mar 2011 19:11:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5C82B23888EA; Fri, 25 Mar 2011 19:10:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1085523 - /subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Date: Fri, 25 Mar 2011 19:10:51 -0000 To: commits@subversion.apache.org From: cmpilato@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110325191051.5C82B23888EA@eris.apache.org> 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) ########################################################################