svn commit: r990824 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Mon Aug 30 15:32:14 2010
New Revision: 990824

URL: http://svn.apache.org/viewvc?rev=990824&view=rev
Log:
* subversion/tests/cmdline/merge_tests.py
  (global): Import Wimp.
  (test_list): Mark committed_case_only_move_and_revert as Wimp, because
    it passes on case sensitive filesystems with single-db.

Modified:
    subversion/trunk/subversion/tests/cmdline/merge_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=990824&r1=990823&r2=990824&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Aug 30 15:32:14 2010
@@ -37,6 +37,7 @@ Item = wc.StateItem
 XFail = svntest.testcase.XFail
 Skip = svntest.testcase.Skip
 SkipUnless = svntest.testcase.SkipUnless
+Wimp = svntest.testcase.Wimp
 
 from svntest.main import SVN_PROP_MERGEINFO
 from svntest.main import server_has_mergeinfo
@@ -16082,8 +16083,9 @@ test_list = [ None,
                          server_has_mergeinfo),
               XFail(merge_automatic_conflict_resolution),
               skipped_files_get_correct_mergeinfo,
-              XFail(committed_case_only_move_and_revert,
-                    is_fs_case_insensitive),
+              Wimp("Needs single-db",
+                   committed_case_only_move_and_revert,
+                   is_fs_case_insensitive),
               merge_into_wc_for_deleted_branch,
               foreign_repos_del_and_props,
               immediate_depth_merge_creates_minimal_subtree_mergeinfo,