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 17:37:29 UTC

svn commit: r1044425 - in /subversion/trunk/subversion/tests: cmdline/diff_tests.py cmdline/merge_tree_conflict_tests.py cmdline/svnsync_tests.py cmdline/switch_tests.py cmdline/update_tests.py libsvn_wc/op-depth-test.c

Author: philip
Date: Fri Dec 10 16:37:28 2010
New Revision: 1044425

URL: http://svn.apache.org/viewvc?rev=1044425&view=rev
Log:
Mark all op-depth WIMP tests as PASS.

* subversion/tests/libsvn_wc/op-depth-test.c
  (test_list): Mark all test PASS

* subversion/tests/cmdline/svnsync_tests.py:
  (test_list): Mark copy_with_mod_from_unreadable_dir PASS.

* subversion/tests/cmdline/switch_tests.py:
  (test_list): Mark tree_conflicts_on_switch_2_1 PASS.

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (test_list): Mark merge_catches_nonexistent_target PASS.

* subversion/tests/cmdline/update_tests.py
  (test_list): Mark tree_conflicts_on_update_2_1 PASS.

* subversion/tests/cmdline/diff_tests.py
  (test_list): Mark diff_in_renamed_folder PASS.

Modified:
    subversion/trunk/subversion/tests/cmdline/diff_tests.py
    subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
    subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
    subversion/trunk/subversion/tests/cmdline/switch_tests.py
    subversion/trunk/subversion/tests/cmdline/update_tests.py
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1044425&r1=1044424&r2=1044425&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Dec 10 16:37:28 2010
@@ -3796,7 +3796,7 @@ test_list = [ None,
               diff_weird_author,
               diff_ignore_whitespace,
               diff_ignore_eolstyle,
-              Wimp("needs op-depth", diff_in_renamed_folder),
+              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=1044425&r1=1044424&r2=1044425&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 16:37:28 2010
@@ -1878,7 +1878,7 @@ def merge_replace_causes_tree_conflict2(
 test_list = [ None,
               SkipUnless(delete_file_and_dir,
                          server_has_mergeinfo),
-              SkipUnless(Wimp("needs op-depth", merge_catches_nonexistent_target),
+              SkipUnless(merge_catches_nonexistent_target,
                          server_has_mergeinfo),
               SkipUnless(merge_tree_deleted_in_target,
                          server_has_mergeinfo),

Modified: subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnsync_tests.py?rev=1044425&r1=1044424&r2=1044425&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnsync_tests.py Fri Dec 10 16:37:28 2010
@@ -884,9 +884,8 @@ test_list = [ None,
               detect_meddling,
               Skip(basic_authz, svntest.main.is_ra_type_file),
               Skip(copy_from_unreadable_dir, svntest.main.is_ra_type_file),
-              Wimp("Needs local add below copy support in WC-NG",
-                   Skip(copy_with_mod_from_unreadable_dir,
-                        svntest.main.is_ra_type_file)),
+              Skip(copy_with_mod_from_unreadable_dir,
+                   svntest.main.is_ra_type_file),
               Skip(copy_with_mod_from_unreadable_dir_and_copy,
                    svntest.main.is_ra_type_file),
               url_encoding,

Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1044425&r1=1044424&r2=1044425&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Dec 10 16:37:28 2010
@@ -3166,7 +3166,7 @@ test_list = [ None,
               tolerate_local_mods,
               tree_conflicts_on_switch_1_1,
               tree_conflicts_on_switch_1_2,
-              Wimp("needs op-depth", tree_conflicts_on_switch_2_1),
+              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=1044425&r1=1044424&r2=1044425&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Dec 10 16:37:28 2010
@@ -5398,7 +5398,7 @@ test_list = [ None,
               restarted_update_should_delete_dir_prop,
               tree_conflicts_on_update_1_1,
               tree_conflicts_on_update_1_2,
-              Wimp("needs op-depth", tree_conflicts_on_update_2_1),
+              tree_conflicts_on_update_2_1,
               tree_conflicts_on_update_2_2,
               XFail(tree_conflicts_on_update_2_3),
               tree_conflicts_on_update_3,

Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1044425&r1=1044424&r2=1044425&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Fri Dec 10 16:37:28 2010
@@ -1922,49 +1922,35 @@ test_del_replace_not_present(const svn_t
 struct svn_test_descriptor_t test_funcs[] =
   {
     SVN_TEST_NULL,
-    SVN_TEST_OPTS_WIMP(test_wc_wc_copies,
-                       "test_wc_wc_copies",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_reverts,
-                       "test_reverts",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_deletes,
-                       "test_deletes",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_delete_of_copies,
-                       "test_delete_of_copies",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_delete_with_base,
-                       "test_delete_with_base",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_adds,
-                       "test_adds",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_repo_wc_copies,
-                       "test_repo_wc_copies",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_delete_with_update,
-                       "test_delete_with_update",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_adds_change_kind,
-                       "test_adds_change_kind",
-                       "needs op_depth"),
+    SVN_TEST_OPTS_PASS(test_wc_wc_copies,
+                       "test_wc_wc_copies"),
+    SVN_TEST_OPTS_PASS(test_reverts,
+                       "test_reverts"),
+    SVN_TEST_OPTS_PASS(test_deletes,
+                       "test_deletes"),
+    SVN_TEST_OPTS_PASS(test_delete_of_copies,
+                       "test_delete_of_copies"),
+    SVN_TEST_OPTS_PASS(test_delete_with_base,
+                       "test_delete_with_base"),
+    SVN_TEST_OPTS_PASS(test_adds,
+                       "test_adds"),
+    SVN_TEST_OPTS_PASS(test_repo_wc_copies,
+                       "test_repo_wc_copies"),
+    SVN_TEST_OPTS_PASS(test_delete_with_update,
+                       "test_delete_with_update"),
+    SVN_TEST_OPTS_PASS(test_adds_change_kind,
+                       "test_adds_change_kind"),
     SVN_TEST_OPTS_PASS(test_base_dir_insert_remove,
                        "test_base_dir_insert_remove"),
-    SVN_TEST_OPTS_WIMP(test_temp_op_make_copy,
-                       "test_temp_op_make_copy",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_wc_move,
-                       "test_wc_move",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_mixed_rev_copy,
-                       "test_mixed_rev_copy",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_delete_of_replace,
-                       "test_delete_of_replace",
-                       "needs op_depth"),
-    SVN_TEST_OPTS_WIMP(test_del_replace_not_present,
-                       "test_del_replace_not_present",
-                       "needs op_depth"),
+    SVN_TEST_OPTS_PASS(test_temp_op_make_copy,
+                       "test_temp_op_make_copy"),
+    SVN_TEST_OPTS_PASS(test_wc_move,
+                       "test_wc_move"),
+    SVN_TEST_OPTS_PASS(test_mixed_rev_copy,
+                       "test_mixed_rev_copy"),
+    SVN_TEST_OPTS_PASS(test_delete_of_replace,
+                       "test_delete_of_replace"),
+    SVN_TEST_OPTS_PASS(test_del_replace_not_present,
+                       "test_del_replace_not_present"),
     SVN_TEST_NULL
   };