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

[pb...@apache.org]

Author: pburba
Date: Mon Jul 19 22:14:58 2010
New Revision: 965659

URL: http://svn.apache.org/viewvc?rev=965659&view=rev
Log:
Follow-up to r965650, fix an XFail condition.

* subversion/tests/cmdline/merge_tests.py
  (test_list): Not sure why the condition (is_os_windows 
   and (is_ra_type_dav_serf or is_ra_type_dav_neon)) expected neon to PASS,
   but I'll ponder that another day.  Dinner beckons, and so I'll fix this
   by using svntest.main.is_ra_type_dav instead.


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=965659&r1=965658&r2=965659&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Jul 19 22:14:58 2010
@@ -15958,8 +15958,7 @@ test_list = [ None,
               record_only_merge_creates_self_referential_mergeinfo,
               XFail(copy_causes_phantom_eol_conflict,
                     svntest.main.is_os_windows and
-                    (svntest.main.is_ra_type_dav_serf or
-                     svntest.main.is_ra_type_dav_neon)),
+                    svntest.main.is_ra_type_dav),
              ]
 
 if __name__ == '__main__':