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
