[[[ svnrdump: Add new copy-and-modify test. * subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump: Add a new testdata to be used by the copy_and_modify test in svnrdump. Taken originally from svnsync_test_data/ and converted to dumpfile v3 format.
* subversion/tests/cmdline/svnrdump_tests_data/revision0.dump: Cosmetically rename revision0.dump to revision-0.dump. * subversion/tests/cmdline/svnrdump_tests_data/revision-0.dump: Add. * subversion/tests/cmdline/svnrdump_tests.py (revision0, revision_0): Cosmetically rename the revision 0 test. (copy_and_modify): Import a new test from svnsync. It is expected to fail due to mismatch in the headers produced by svnrdump and svnadmin. (test_list): Add copy_and_modify to the list of tests to be run, carefully noting that it is expected to fail. ]]] Index: subversion/tests/cmdline/svnrdump_tests_data/revision0.dump =================================================================== --- subversion/tests/cmdline/svnrdump_tests_data/revision0.dump (revision 979511) +++ subversion/tests/cmdline/svnrdump_tests_data/revision0.dump (working copy) @@ -1,30 +0,0 @@ -SVN-fs-dump-format-version: 3 - -UUID: 95f5730d-843b-4fe3-8879-f46da52f2123 - -Revision-number: 0 -Prop-content-length: 258 -Content-length: 258 - -K 8 -svn:date -V 27 -2003-01-08T10:33:40.549533Z -K 26 -svn:sync-currently-copying -V 2 -15 -K 17 -svn:sync-from-url -V 31 -http://svn.apache.org/repos/asf -K 18 -svn:sync-from-uuid -V 36 -13f79535-47bb-0310-9956-ffa450edef68 -K 24 -svn:sync-last-merged-rev -V 2 -14 -PROPS-END - Index: subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump =================================================================== --- subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump (revision 0) +++ subversion/tests/cmdline/svnrdump_tests_data/copy-and-modify.dump (working copy) @@ -0,0 +1,82 @@ +SVN-fs-dump-format-version: 3 + +UUID: 6ad9f820-0205-0410-94a2-c8cf366bb2b3 + +Revision-number: 0 +Prop-content-length: 56 +Content-length: 56 + +K 8 +svn:date +V 27 +2005-11-07T23:36:48.095832Z +PROPS-END + +Revision-number: 1 +Prop-content-length: 112 +Content-length: 112 + +K 10 +svn:author +V 6 +rooneg +K 8 +svn:date +V 27 +2005-11-07T23:37:17.705159Z +K 7 +svn:log +V 11 +add foo.txt +PROPS-END + +Node-path: foo.txt +Node-kind: file +Node-action: add +Prop-content-length: 10 +Text-delta: true +Text-content-length: 4 +Text-content-md5: d41d8cd98f00b204e9800998ecf8427e +Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 +Content-length: 14 + +PROPS-END +SVN + +Revision-number: 2 +Prop-content-length: 135 +Content-length: 135 + +K 10 +svn:author +V 6 +rooneg +K 8 +svn:date +V 27 +2005-11-07T23:37:44.549695Z +K 7 +svn:log +V 34 +copy and change at the same time. + +PROPS-END + +Node-path: bar.txt +Node-kind: file +Node-action: add +Node-copyfrom-rev: 1 +Node-copyfrom-path: foo.txt +Text-copy-source-md5: d41d8cd98f00b204e9800998ecf8427e +Text-copy-source-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 +Text-delta: true +Text-delta-base-md5: d41d8cd98f00b204e9800998ecf8427e +Text-delta-base-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709 +Text-content-length: 19 +Text-content-md5: d2508118d0d39e198d1129d87d692d59 +Text-content-sha1: e2fb5f2139d086ded2cb600d5a91a196e76bf020 +Content-length: 19 + +SVN �modified + + Index: subversion/tests/cmdline/svnrdump_tests.py =================================================================== --- subversion/tests/cmdline/svnrdump_tests.py (revision 979511) +++ subversion/tests/cmdline/svnrdump_tests.py (working copy) @@ -95,10 +95,14 @@ def basic_svnrdump(sbox): if not out[0].startswith('SVN-fs-dump-format-version:'): raise svntest.Failure('No valid output') -def revision0(sbox): +def revision_0(sbox): "dump revision zero" - run_test(sbox, dumpfile_name = "revision0.dump") - + run_test(sbox, dumpfile_name = "revision-0.dump") + +def copy_and_modify(sbox): + "copy and modify" + run_test(sbox, "copy-and-modify.dump") + ######################################################################## # Run the tests @@ -106,7 +110,8 @@ def basic_svnrdump(sbox): # list all tests here, starting with None: test_list = [ None, basic_svnrdump, - revision0, + revision_0, + XFail(copy_and_modify), ] if __name__ == '__main__':
