You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/12/03 19:54:35 UTC
svn commit: r1547527 - in /subversion/trunk/subversion/tests/cmdline:
blame_tests.py externals_tests.py log_tests.py merge_reintegrate_tests.py
merge_tests.py mergeinfo_tests.py resolve_tests.py revert_tests.py
update_tests.py
Author: stefan2
Date: Tue Dec 3 18:54:35 2013
New Revision: 1547527
URL: http://svn.apache.org/r1547527
Log:
Skip tests that are known to depend on server-side mergeinfo support
in 1.3 and 1.4 compat mode.
* subversion/tests/cmdline/revert_tests.py
(create_superflous_actual_node):
(revert_empty_actual):
(revert_empty_actual_recursive):
* subversion/tests/cmdline/update_tests.py
(update_empty_hides_entries):
--This line, and those below, will be ignored--
* subversion/tests/cmdline/blame_tests.py
(blame_output_after_merge): Skip if the server does not support mergeinfo.
* subversion/tests/cmdline/externals_tests.py
(merge_target_with_externals): Same.
* subversion/tests/cmdline/log_tests.py
(merge_sensitive_log_copied_path_inherited_mergeinfo): Same.
* subversion/tests/cmdline/mergeinfo_tests.py
(mergeinfo,
mergeinfo_on_unknown_url,
non_inheritable_mergeinfo): Same.
* subversion/tests/cmdline/merge_reintegrate_tests.py
(reintegrate_with_rename,
reintegrate_branch_never_merged_to,
reintegrate_fail_on_modified_wc,
reintegrate_fail_on_mixed_rev_wc,
reintegrate_fail_on_switched_wc,
reintegrate_on_shallow_wc,
merge_file_with_space_in_its_path,
reintegrate_with_self_referential_mergeinfo,
added_subtrees_with_mergeinfo_break_reintegrate,
two_URL_merge_removes_valid_mergeinfo_from_target,
reintegrate_creates_bogus_mergeinfo,
no_source_subtree_mergeinfo,
reintegrate_symlink_deletion,
no_op_reintegrate,
renamed_branch_reintegrate): Same.
* subversion/tests/cmdline/merge_tests.py
(merge_with_implicit_target_using_r,
merge_range_predates_history,
commit_to_subtree_added_by_merge,
copy_then_replace_via_merge,
skipped_files_get_correct_mergeinfo,
merge_into_wc_for_deleted_branch,
record_only_merge_creates_self_referential_mergeinfo,
merge_with_os_deleted_subtrees,
merge_change_to_file_with_executable,
merge_properties_on_adds): Same.
* subversion/tests/cmdline/resolve_tests.py
(resolved_on_deleted_item): Same.
* subversion/tests/cmdline/revert_tests.py
(revert_empty_actual,
revert_empty_actual_recursive): Same.
* subversion/tests/cmdline/update_tests.py
(mergeinfo_updates_merge_with_local_mods): Same.
Modified:
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/log_tests.py
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
subversion/trunk/subversion/tests/cmdline/resolve_tests.py
subversion/trunk/subversion/tests/cmdline/revert_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Tue Dec 3 18:54:35 2013
@@ -619,6 +619,7 @@ def blame_file_not_in_head(sbox):
svntest.actions.run_and_verify_svn(None, [], expected_err,
'blame', notexisting_url)
+@SkipUnless(server_has_mergeinfo)
def blame_output_after_merge(sbox):
"blame -g output with inserted lines"
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue Dec 3 18:54:35 2013
@@ -1588,6 +1588,7 @@ def wc_repos_file_externals(sbox):
True)
#----------------------------------------------------------------------
+@SkipUnless(svntest.main.server_has_mergeinfo)
@Issue(3843)
def merge_target_with_externals(sbox):
"merge target with externals"
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Tue Dec 3 18:54:35 2013
@@ -2070,6 +2070,7 @@ def log_on_nonexistent_path_and_valid_re
#----------------------------------------------------------------------
# Test for issue #4022 'svn log -g interprets change in inherited mergeinfo
# due to move as a merge'.
+@SkipUnless(server_has_mergeinfo)
@Issue(4022)
def merge_sensitive_log_copied_path_inherited_mergeinfo(sbox):
"log -g on copied path with inherited mergeinfo"
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Tue Dec 3 18:54:35 2013
@@ -328,6 +328,7 @@ def basic_reintegrate(sbox):
None, True, True)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def reintegrate_with_rename(sbox):
"merge --reintegrate with renamed file on branch"
@@ -568,6 +569,7 @@ def reintegrate_with_rename(sbox):
expected_status, None, wc_dir)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def reintegrate_branch_never_merged_to(sbox):
"merge --reintegrate on a never-updated branch"
@@ -699,6 +701,7 @@ def reintegrate_branch_never_merged_to(s
expected_status, None, wc_dir)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def reintegrate_fail_on_modified_wc(sbox):
"merge --reintegrate should fail in modified wc"
sbox.build()
@@ -722,6 +725,7 @@ def reintegrate_fail_on_modified_wc(sbox
True, False)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def reintegrate_fail_on_mixed_rev_wc(sbox):
"merge --reintegrate should fail in mixed-rev wc"
sbox.build()
@@ -745,6 +749,7 @@ def reintegrate_fail_on_mixed_rev_wc(sbo
True, False)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def reintegrate_fail_on_switched_wc(sbox):
"merge --reintegrate should fail in switched wc"
sbox.build()
@@ -813,6 +818,7 @@ def reintegrate_fail_on_switched_wc(sbox
#----------------------------------------------------------------------
# Test for issue #3603 'allow reintegrate merges into WCs with
# missing subtrees'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3603)
def reintegrate_on_shallow_wc(sbox):
"merge --reintegrate in shallow wc"
@@ -1003,6 +1009,7 @@ def reintegrate_fail_on_stale_source(sbo
[], True, True)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def merge_file_with_space_in_its_path(sbox):
"merge a file with space in its path"
@@ -1716,6 +1723,7 @@ def multiple_reintegrates_from_the_same_
#
# Also tests Issue #3591 'reintegrate merges update subtree mergeinfo
# unconditionally'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3591)
def reintegrate_with_self_referential_mergeinfo(sbox):
"source has target's history as explicit mergeinfo"
@@ -2002,6 +2010,7 @@ def reintegrate_with_subtree_merges(sbox
#----------------------------------------------------------------------
# Test for issue #3654 'added subtrees with mergeinfo break reintegrate'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3654)
def added_subtrees_with_mergeinfo_break_reintegrate(sbox):
"added subtrees with mergeinfo break reintegrate"
@@ -2195,6 +2204,7 @@ def added_subtrees_with_mergeinfo_break_
#----------------------------------------------------------------------
# Test for issue #3648 '2-URL merges incorrectly reverse-merge mergeinfo
# for merge target'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3648)
def two_URL_merge_removes_valid_mergeinfo_from_target(sbox):
"2-URL merge removes valid mergeinfo from target"
@@ -2355,6 +2365,7 @@ def two_URL_merge_removes_valid_mergeinf
#----------------------------------------------------------------------
# Test for issue #3867 'reintegrate merges create mergeinfo for
# non-existent paths'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3867)
def reintegrate_creates_bogus_mergeinfo(sbox):
"reintegrate creates bogus mergeinfo"
@@ -2445,6 +2456,7 @@ def reintegrate_creates_bogus_mergeinfo(
# subtree mergeinfo is reintegrated into a target with subtree
# mergeinfo. Deliberately written in a style that works with the 1.6
# testsuite.
+@SkipUnless(server_has_mergeinfo)
@Issue(3957)
def no_source_subtree_mergeinfo(sbox):
"source without subtree mergeinfo"
@@ -2686,6 +2698,7 @@ def reintegrate_replaced_source(sbox):
#----------------------------------------------------------------------
@SkipUnless(svntest.main.is_posix_os)
+@SkipUnless(server_has_mergeinfo)
@Issue(4052)
def reintegrate_symlink_deletion(sbox):
"reintegrate symlink deletion"
@@ -2722,6 +2735,7 @@ def reintegrate_symlink_deletion(sbox):
run_reintegrate(A_COPY_url, A_path)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def no_op_reintegrate(sbox):
"""no-op reintegrate"""
@@ -2742,6 +2756,7 @@ def no_op_reintegrate(sbox):
run_reintegrate(sbox.repo_url + '/A_COPY', A_path)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
def renamed_branch_reintegrate(sbox):
"""reintegrate a branch that has been renamed"""
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Tue Dec 3 18:54:35 2013
@@ -1057,6 +1057,7 @@ def merge_with_implicit_target_helper(sb
(svntest.tree.get_text('mu'), orig_mu_text))
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
@Issue(785)
def merge_with_implicit_target_using_r(sbox):
"merging a file w/no explicit target path using -r"
@@ -10188,6 +10189,7 @@ def dont_add_mergeinfo_from_own_history(
None, 1)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
@Issue(3094)
def merge_range_predates_history(sbox):
"merge range predates history"
@@ -12093,6 +12095,7 @@ def subtrees_with_empty_mergeinfo(sbox):
#----------------------------------------------------------------------
# Test for issue #3240 'commits to subtrees added by merge
# corrupt working copy and repos'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3240)
def commit_to_subtree_added_by_merge(sbox):
"commits to subtrees added by merge wreak havoc"
@@ -14469,6 +14472,7 @@ def noop_file_merge(sbox):
chi_COPY_path)
#----------------------------------------------------------------------
+@SkipUnless(server_has_mergeinfo)
@Issue(2690)
def copy_then_replace_via_merge(sbox):
"copy then replace via merge"
@@ -14951,6 +14955,7 @@ def merge_automatic_conflict_resolution(
#----------------------------------------------------------------------
# Test for issue #3440 'Skipped paths get incorrect override mergeinfo
# during merge'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3440)
def skipped_files_get_correct_mergeinfo(sbox):
"skipped files get correct mergeinfo set"
@@ -15225,6 +15230,7 @@ def committed_case_only_move_and_revert(
#----------------------------------------------------------------------
# This is a test for issue #3221 'Unable to merge into working copy of
# deleted branch'.
+@SkipUnless(server_has_mergeinfo)
@Issue(3221)
def merge_into_wc_for_deleted_branch(sbox):
"merge into WC of deleted branch should work"
@@ -15486,6 +15492,7 @@ def immediate_depth_merge_creates_minima
#----------------------------------------------------------------------
# Test for issue #3646 'cyclic --record-only merges create self-referential
# mergeinfo'
+@SkipUnless(server_has_mergeinfo)
@Issue(3646)
def record_only_merge_creates_self_referential_mergeinfo(sbox):
"merge creates self referential mergeinfo"
@@ -15837,6 +15844,7 @@ def merge_into_locally_added_directory(s
#----------------------------------------------------------------------
# Test for issue #2915 'Handle mergeinfo for subtrees missing due to removal
# by non-svn command'
+@SkipUnless(server_has_mergeinfo)
@Issue(2915)
def merge_with_os_deleted_subtrees(sbox):
"merge tracking fails if target missing subtrees"
@@ -16123,6 +16131,7 @@ def subtree_merges_inherit_invalid_worki
# Test for issue #3686 'executable flag not correctly set on merge'
# See http://subversion.tigris.org/issues/show_bug.cgi?id=3686
@Issue(3686)
+@SkipUnless(server_has_mergeinfo)
@SkipUnless(svntest.main.is_posix_os)
def merge_change_to_file_with_executable(sbox):
"executable flag is maintained during binary merge"
@@ -17729,6 +17738,7 @@ def merge_target_selection(sbox):
svntest.actions.run_and_verify_svn(None, expected_output, [],
'merge', '^/dir', '-c', '4', 'binary-file')
+@SkipUnless(server_has_mergeinfo)
@Issue(3405) # seems to be the wrong issue number
def merge_properties_on_adds(sbox):
"merged directory properties are added"
Modified: subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py Tue Dec 3 18:54:35 2013
@@ -74,6 +74,7 @@ def no_mergeinfo(sbox):
sbox.repo_url + '/A2',
"--show-revs=merged")
+@SkipUnless(server_has_mergeinfo)
def mergeinfo(sbox):
"'mergeinfo' on a path with mergeinfo"
@@ -172,6 +173,7 @@ def mergeinfo_non_source(sbox):
#----------------------------------------------------------------------
# Issue #3138
+@SkipUnless(server_has_mergeinfo)
@Issue(3138)
def mergeinfo_on_unknown_url(sbox):
"mergeinfo of an unknown url should return error"
@@ -195,6 +197,7 @@ def mergeinfo_on_unknown_url(sbox):
# Test for issue #3126 'svn mergeinfo shows too few or too many
# eligible revisions'. Specifically
# http://subversion.tigris.org/issues/show_bug.cgi?id=3126#desc5.
+@SkipUnless(server_has_mergeinfo)
@Issue(3126)
def non_inheritable_mergeinfo(sbox):
"non-inheritable mergeinfo shows as merged"
Modified: subversion/trunk/subversion/tests/cmdline/resolve_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolve_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Tue Dec 3 18:54:35 2013
@@ -367,6 +367,7 @@ def resolved_on_wc_root(sbox):
svntest.actions.run_and_verify_unquiet_status(wc, expected_status)
#----------------------------------------------------------------------
+@SkipUnless(svntest.main.server_has_mergeinfo)
def resolved_on_deleted_item(sbox):
"resolved on deleted item"
Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Tue Dec 3 18:54:35 2013
@@ -1300,6 +1300,7 @@ def create_superflous_actual_node(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@Issue(3859)
+@SkipUnless(svntest.main.server_has_mergeinfo)
def revert_empty_actual(sbox):
"revert with superfluous actual node"
@@ -1316,8 +1317,9 @@ def revert_empty_actual(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@Issue(3859)
+@SkipUnless(svntest.main.server_has_mergeinfo)
def revert_empty_actual_recursive(sbox):
- "recusive revert with superfluous actual node"
+ "recursive revert with superfluous actual node"
create_superflous_actual_node(sbox)
wc_dir = sbox.wc_dir
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1547527&r1=1547526&r2=1547527&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Tue Dec 3 18:54:35 2013
@@ -5186,6 +5186,7 @@ def update_empty_hides_entries(sbox):
#----------------------------------------------------------------------
# Test for issue #3573 'local non-inheritable mergeinfo changes not
# properly merged with updated mergeinfo'
+@SkipUnless(server_has_mergeinfo)
def mergeinfo_updates_merge_with_local_mods(sbox):
"local mergeinfo changes are merged with updates"