You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/12/10 15:44:28 UTC
svn commit: r1044375 - in /subversion/trunk/subversion/tests/cmdline:
diff_tests.py merge_tree_conflict_tests.py switch_tests.py update_tests.py
Author: philip
Date: Fri Dec 10 14:44:28 2010
New Revision: 1044375
URL: http://svn.apache.org/viewvc?rev=1044375&view=rev
Log:
Mark regression tests WIMP for op-depth.
* subversion/tests/cmdline/switch_tests.py:
(test_list): Mark tree_conflicts_on_switch_2_1 Wimp.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(test_list): Mark merge_catches_nonexistent_target Wimp.
* subversion/tests/cmdline/update_tests.py
(test_list): Mark tree_conflicts_on_update_2_1 Wimp.
* subversion/tests/cmdline/diff_tests.py
(test_list): Mark diff_in_renamed_folder Wimp.
Modified:
subversion/trunk/subversion/tests/cmdline/diff_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1044375&r1=1044374&r2=1044375&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Dec 10 14:44:28 2010
@@ -34,6 +34,7 @@ import svntest
# (abbreviation)
Skip = svntest.testcase.Skip
XFail = svntest.testcase.XFail
+Wimp = svntest.testcase.Wimp
Item = svntest.wc.StateItem
@@ -3795,7 +3796,7 @@ test_list = [ None,
diff_weird_author,
diff_ignore_whitespace,
diff_ignore_eolstyle,
- XFail(diff_in_renamed_folder),
+ Wimp("needs op-depth", diff_in_renamed_folder),
diff_with_depth,
diff_ignore_eolstyle_empty_lines,
diff_backward_repos_wc_copy,
Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1044375&r1=1044374&r2=1044375&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri Dec 10 14:44:28 2010
@@ -35,6 +35,7 @@ from svntest import main, wc, verify, ac
# (abbreviation)
Item = wc.StateItem
XFail = svntest.testcase.XFail
+Wimp = svntest.testcase.Wimp
Skip = svntest.testcase.Skip
SkipUnless = svntest.testcase.SkipUnless
@@ -1877,7 +1878,7 @@ def merge_replace_causes_tree_conflict2(
test_list = [ None,
SkipUnless(delete_file_and_dir,
server_has_mergeinfo),
- SkipUnless(XFail(merge_catches_nonexistent_target),
+ SkipUnless(Wimp("needs op-depth", merge_catches_nonexistent_target),
server_has_mergeinfo),
SkipUnless(merge_tree_deleted_in_target,
server_has_mergeinfo),
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1044375&r1=1044374&r2=1044375&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Dec 10 14:44:28 2010
@@ -35,6 +35,7 @@ from svntest import verify, actions, mai
Skip = svntest.testcase.Skip
SkipUnless = svntest.testcase.SkipUnless
XFail = svntest.testcase.XFail
+Wimp = svntest.testcase.Wimp
Item = svntest.wc.StateItem
from svntest.main import SVN_PROP_MERGEINFO, server_has_mergeinfo
@@ -3165,7 +3166,7 @@ test_list = [ None,
tolerate_local_mods,
tree_conflicts_on_switch_1_1,
tree_conflicts_on_switch_1_2,
- XFail(tree_conflicts_on_switch_2_1),
+ Wimp("needs op-depth", tree_conflicts_on_switch_2_1),
tree_conflicts_on_switch_2_2,
tree_conflicts_on_switch_3,
single_file_relocate,
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1044375&r1=1044374&r2=1044375&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Dec 10 14:44:28 2010
@@ -38,6 +38,7 @@ from merge_tests import set_up_branch
Skip = svntest.testcase.Skip
SkipUnless = svntest.testcase.SkipUnless
XFail = svntest.testcase.XFail
+Wimp = svntest.testcase.Wimp
Item = svntest.wc.StateItem
exp_noop_up_out = svntest.actions.expected_noop_update_output
@@ -5397,7 +5398,7 @@ test_list = [ None,
restarted_update_should_delete_dir_prop,
tree_conflicts_on_update_1_1,
tree_conflicts_on_update_1_2,
- XFail(tree_conflicts_on_update_2_1),
+ Wimp("needs op-depth", tree_conflicts_on_update_2_1),
tree_conflicts_on_update_2_2,
XFail(tree_conflicts_on_update_2_3),
tree_conflicts_on_update_3,