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

[pb...@apache.org]

Author: pburba
Date: Wed Jan  5 20:52:20 2011
New Revision: 1055637

URL: http://svn.apache.org/viewvc?rev=1055637&view=rev
Log:
Fix XFail conditional on issue #3657 test.

* subversion/tests/cmdline/merge_tests.py
  (test_list): dav_skelta_mode_causes_spurious_conflicts should fail over
   dav providers regardless of platform, this isn't a windows only issue
   any more (not that it ever really was, but the test was initially
   written that way).



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=1055637&r1=1055636&r2=1055637&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Wed Jan  5 20:52:20 2011
@@ -16506,7 +16506,7 @@ test_list = [ None,
               immediate_depth_merge_creates_minimal_subtree_mergeinfo,
               record_only_merge_creates_self_referential_mergeinfo,
               XFail(dav_skelta_mode_causes_spurious_conflicts,
-                    svntest.main.is_windows_type_dav),
+                    svntest.main.is_ra_type_dav),
               merge_into_locally_added_file,
               merge_into_locally_added_directory,
               merge_with_os_deleted_subtrees,