Merge r1242537 from trunk:
* r1242537
Skip 'svnrdump dump' tests over serf.
Justification:
Users should not have to ignore regression test FAILs.
Votes:
+1: philip, stsp
+1: rhuijben (Really +0.5, as we should just fix the problems. But we
won't get this done in time for 1.7.3)
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x@1242771 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS b/STATUS
index e353249..0646dad 100644
--- a/STATUS
+++ b/STATUS
@@ -104,15 +104,6 @@
Approved changes:
=================
- * r1242537
- Skip 'svnrdump dump' tests over serf.
- Justification:
- Users should not have to ignore regression test FAILs.
- Votes:
- +1: philip, stsp
- +1: rhuijben (Really +0.5, as we should just fix the problems. But we
- won't get this done in time for 1.7.3)
-
* r1242607
Convert ra_serf assertions to errors.
Justification:
diff --git a/subversion/tests/cmdline/svnrdump_tests.py b/subversion/tests/cmdline/svnrdump_tests.py
index 65b04fe..f5cc3f5 100755
--- a/subversion/tests/cmdline/svnrdump_tests.py
+++ b/subversion/tests/cmdline/svnrdump_tests.py
@@ -162,6 +162,7 @@
######################################################################
# Tests
+@Skip(svntest.main.is_ra_type_dav_serf)
def basic_dump(sbox):
"dump: standard sbox repos"
sbox.build(read_only = True, create_wc = False)
@@ -174,6 +175,7 @@
if not out[0].startswith('SVN-fs-dump-format-version:'):
raise svntest.Failure('No valid output')
+@Skip(svntest.main.is_ra_type_dav_serf)
def revision_0_dump(sbox):
"dump: revision zero"
run_dump_test(sbox, "revision-0.dump")
@@ -192,6 +194,7 @@
# docs/ (Added r6)
# README (Added r6)
+@Skip(svntest.main.is_ra_type_dav_serf)
def skeleton_dump(sbox):
"dump: skeleton repository"
run_dump_test(sbox, "skeleton.dump")
@@ -200,6 +203,7 @@
"load: skeleton repository"
run_load_test(sbox, "skeleton.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def sparse_propchanges_dump(sbox):
"dump: sparse file/dir propchanges"
run_dump_test(sbox, "sparse-propchanges.dump")
@@ -209,6 +213,7 @@
"load: sparse file/dir propchanges"
run_load_test(sbox, "sparse-propchanges.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def copy_and_modify_dump(sbox):
"dump: copy and modify"
run_dump_test(sbox, "copy-and-modify.dump")
@@ -217,6 +222,7 @@
"load: copy and modify"
run_load_test(sbox, "copy-and-modify.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def no_author_dump(sbox):
"dump: copy revs with no svn:author revprops"
run_dump_test(sbox, "no-author.dump")
@@ -225,6 +231,7 @@
"load: copy revs with no svn:author revprops"
run_load_test(sbox, "no-author.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def copy_from_previous_version_and_modify_dump(sbox):
"dump: copy from previous version and modify"
run_dump_test(sbox, "copy-from-previous-version-and-modify.dump")
@@ -233,6 +240,7 @@
"load: copy from previous version and modify"
run_load_test(sbox, "copy-from-previous-version-and-modify.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def modified_in_place_dump(sbox):
"dump: modified in place"
run_dump_test(sbox, "modified-in-place.dump")
@@ -241,6 +249,7 @@
"load: modified in place"
run_load_test(sbox, "modified-in-place.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def move_and_modify_in_the_same_revision_dump(sbox):
"dump: move parent & modify child file in same rev"
run_dump_test(sbox, "move-and-modify.dump")
@@ -249,6 +258,7 @@
"load: move parent & modify child file in same rev"
run_load_test(sbox, "move-and-modify.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def tag_empty_trunk_dump(sbox):
"dump: tag empty trunk"
run_dump_test(sbox, "tag-empty-trunk.dump")
@@ -257,6 +267,7 @@
"load: tag empty trunk"
run_load_test(sbox, "tag-empty-trunk.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def tag_trunk_with_file_dump(sbox):
"dump: tag trunk containing a file"
run_dump_test(sbox, "tag-trunk-with-file.dump")
@@ -265,6 +276,7 @@
"load: tag trunk containing a file"
run_load_test(sbox, "tag-trunk-with-file.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def tag_trunk_with_file2_dump(sbox):
"dump: tag trunk containing a file (#2)"
run_dump_test(sbox, "tag-trunk-with-file2.dump")
@@ -273,6 +285,7 @@
"load: tag trunk containing a file (#2)"
run_load_test(sbox, "tag-trunk-with-file2.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def dir_prop_change_dump(sbox):
"dump: directory property changes"
run_dump_test(sbox, "dir-prop-change.dump")
@@ -281,6 +294,7 @@
"load: directory property changes"
run_load_test(sbox, "dir-prop-change.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def copy_parent_modify_prop_dump(sbox):
"dump: copy parent and modify prop"
run_dump_test(sbox, "copy-parent-modify-prop.dump")
@@ -289,6 +303,7 @@
"load: copy parent and modify prop"
run_load_test(sbox, "copy-parent-modify-prop.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def copy_revprops_dump(sbox):
"dump: copy revprops other than svn:*"
run_dump_test(sbox, "revprops.dump")
@@ -297,16 +312,19 @@
"load: copy revprops other than svn:*"
run_load_test(sbox, "revprops.dump")
+@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")
+@Skip(svntest.main.is_ra_type_dav_serf)
def only_trunk_A_with_changes_dump(sbox):
"dump: subdirectory with changes on root"
run_dump_test(sbox, "trunk-A-changes.dump", subdir="/trunk/A",
expected_dumpfile_name="trunk-A-changes.expected.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def url_encoding_dump(sbox):
"dump: url encoding issues"
run_dump_test(sbox, "url-encoding-bug.dump")
@@ -315,18 +333,21 @@
"load: url encoding issues"
run_load_test(sbox, "url-encoding-bug.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def copy_bad_line_endings_dump(sbox):
"dump: inconsistent line endings in svn:* props"
run_dump_test(sbox, "copy-bad-line-endings.dump",
expected_dumpfile_name="copy-bad-line-endings.expected.dump",
bypass_prop_validation=True)
+@Skip(svntest.main.is_ra_type_dav_serf)
def copy_bad_line_endings2_dump(sbox):
"dump: non-LF line endings in svn:* props"
run_dump_test(sbox, "copy-bad-line-endings2.dump",
expected_dumpfile_name="copy-bad-line-endings2.expected.dump",
bypass_prop_validation=True)
+@Skip(svntest.main.is_ra_type_dav_serf)
def commit_a_copy_of_root_dump(sbox):
"dump: commit a copy of root"
run_dump_test(sbox, "repo-with-copy-of-root-dir.dump")
@@ -335,6 +356,7 @@
"load: commit a copy of root"
run_load_test(sbox, "repo-with-copy-of-root-dir.dump")
+@Skip(svntest.main.is_ra_type_dav_serf)
def descend_into_replace_dump(sbox):
"dump: descending into replaced dir looks in src"
run_dump_test(sbox, "descend-into-replace.dump", subdir='/trunk/H',
@@ -345,6 +367,7 @@
run_load_test(sbox, "descend-into-replace.dump")
@Issue(3847)
+@Skip(svntest.main.is_ra_type_dav_serf)
def add_multi_prop_dump(sbox):
"dump: add with multiple props"
run_dump_test(sbox, "add-multi-prop.dump")
@@ -359,6 +382,7 @@
# revs in svn:mergeinfo' but uses 'svnrdump load' in place of
# 'svnadmin load'.
@Issue(3890)
+@Skip(svntest.main.is_ra_type_dav_serf)
def reflect_dropped_renumbered_revs(sbox):
"svnrdump renumbers dropped revs in mergeinfo"
@@ -422,6 +446,7 @@
# from incremental dump' but uses 'svnrdump [dump|load]' in place of
# 'svnadmin [dump|load]'.
@Issue(3890)
+@Skip(svntest.main.is_ra_type_dav_serf)
def dont_drop_valid_mergeinfo_during_incremental_svnrdump_loads(sbox):
"don't drop mergeinfo revs in incremental svnrdump"
