You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2014/12/18 16:37:20 UTC
svn commit: r1646479 - in /subversion/trunk/subversion/tests/cmdline:
svnrdump_tests.py svnrdump_tests_data/mergeinfo-contains-r0.dump
svnrdump_tests_data/mergeinfo-contains-r0.expected.dump
Author: julianfoad
Date: Thu Dec 18 15:37:19 2014
New Revision: 1646479
URL: http://svn.apache.org/r1646479
Log:
Add tests for 'svnrdump dump' and 'svnrdump load' with mergeinfo that refers
to r0. Part of issue #4476 "Mergeinfo containing r0 makes svnsync and dump
and load fail".
* subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump,
subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump
New files, copied from svnsync_tests_data/ and updated to dump format 3.
* subversion/tests/cmdline/svnrdump_tests.py
(dump_mergeinfo_contains_r0): New test, passing.
(load_mergeinfo_contains_r0): New test, XFail.
(test_list): Run them.
Added:
subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump
- copied, changed from r1646287, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump
subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump
- copied, changed from r1646287, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.expected.dump
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=1646479&r1=1646478&r2=1646479&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py Thu Dec 18 15:37:19 2014
@@ -806,6 +806,25 @@ def load_prop_change_in_non_deltas_dump(
[], [], 0,
'-q', 'load', sbox.repo_url)
+#----------------------------------------------------------------------
+
+@Issue(4476)
+def dump_mergeinfo_contains_r0(sbox):
+ "dump: mergeinfo that contains r0"
+ ### We pass the original dump file name as 'expected_dumpfile_name' because
+ ### run_dump_test is currently broken when we don't.
+ run_dump_test(sbox, "mergeinfo-contains-r0.dump",
+ bypass_prop_validation=True)
+
+#----------------------------------------------------------------------
+
+@XFail()
+@Issue(4476)
+def load_mergeinfo_contains_r0(sbox):
+ "load: mergeinfo that contains r0"
+ run_load_test(sbox, "mergeinfo-contains-r0.dump",
+ expected_dumpfile_name="mergeinfo-contains-r0.expected.dump")
+
########################################################################
# Run the tests
@@ -862,6 +881,8 @@ test_list = [ None,
only_trunk_range_dump,
only_trunk_A_range_dump,
load_prop_change_in_non_deltas_dump,
+ dump_mergeinfo_contains_r0,
+ load_mergeinfo_contains_r0,
]
if __name__ == '__main__':
Copied: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump (from r1646287, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump?p2=subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump&p1=subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump&r1=1646287&r2=1646479&rev=1646479&view=diff
==============================================================================
Binary files subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.dump (original) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.dump Thu Dec 18 15:37:19 2014 differ
Copied: subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump (from r1646287, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.expected.dump)
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump?p2=subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump&p1=subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.expected.dump&r1=1646287&r2=1646479&rev=1646479&view=diff
==============================================================================
Binary files subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/mergeinfo-contains-r0.expected.dump (original) and subversion/trunk/subversion/tests/cmdline/svnrdump_tests_data/mergeinfo-contains-r0.expected.dump Thu Dec 18 15:37:19 2014 differ