Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 67E5CD163 for ; Tue, 6 Nov 2012 12:28:08 +0000 (UTC) Received: (qmail 4849 invoked by uid 500); 6 Nov 2012 12:28:08 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 3181 invoked by uid 500); 6 Nov 2012 12:28:01 -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 2182 invoked by uid 99); 6 Nov 2012 12:27:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Nov 2012 12:27:59 +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; Tue, 06 Nov 2012 12:27:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E486D238890D; Tue, 6 Nov 2012 12:27:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1406112 - in /subversion/trunk/subversion/tests/cmdline: svnrdump_tests.py svnrdump_tests_data/trunk-A-changes.expected.dump svnrdump_tests_data/trunk-only.expected.dump Date: Tue, 06 Nov 2012 12:27:35 -0000 To: commits@subversion.apache.org From: pburba@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121106122735.E486D238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pburba Date: Tue Nov 6 12:27:35 2012 New Revision: 1406112 URL: http://svn.apache.org/viewvc?rev=1406112&view=rev Log: Fix the last two XFailing svnrdump tests from r1224634. * subversion/tests/cmdline/svnrdump_tests.py (run_dump_test): Fix typo. (only_trunk_dump, only_trunk_A_with_changes_dump): Remove XFail decorator. * subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump * subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump Recreate from hand-edited svnadmin dump files. Tweaks included: Dumps from svnrdump always include the 'Prop-delta: true' header and don't include the any *-sha1 headers. The text deltas are also different now, see http://svn.haxx.se/dev/archive-2011-12/0350.shtml Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py?rev=1406112&r1=1406111&r2=1406112&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Tue Nov 6 12:27:35 2012 @@ -100,7 +100,7 @@ def run_dump_test(sbox, dumpfile_name, e expected_dumpfile_name is produced if provided. Additionally, the subdir argument appends itself to the URL""" - # Create an empty sanbox repository + # Create an empty sandbox repository build_repos(sbox) # This directory contains all the dump files @@ -347,14 +347,12 @@ def copy_revprops_load(sbox): "load: copy revprops other than svn:*" run_load_test(sbox, "revprops.dump") -@XFail() @Skip(svntest.main.is_ra_type_dav_serf) def only_trunk_dump(sbox): "dump: subdirectory" run_dump_test(sbox, "trunk-only.dump", subdir="/trunk", - expected_dumpfile_name="trunk-only.expected.dump") + expected_dumpfile_name="trunk-only.expected.dump",) -@XFail() @Skip(svntest.main.is_ra_type_dav_serf) def only_trunk_A_with_changes_dump(sbox): "dump: subdirectory with changes on root" Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump?rev=1406112&r1=1406111&r2=1406112&view=diff ============================================================================== Files subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump (original) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-A-changes.expected.dump Tue Nov 6 12:27:35 2012 differ Modified: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump?rev=1406112&r1=1406111&r2=1406112&view=diff ============================================================================== Files subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump (original) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/trunk-only.expected.dump Tue Nov 6 12:27:35 2012 differ