Author: rhuijben
Date: Tue May 18 08:52:47 2010
New Revision: 945543
URL: http://svn.apache.org/viewvc?rev=945543&view=rev
Log:
* subversion/tests/cmdline/merge_authz_tests.py
(test_list): Mark reintegrate_fails_if_no_root_access only
XFail for ra_dav.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=945543&r1=945542&r2=945543&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Tue May 18
08:52:47 2010
@@ -730,7 +730,8 @@ test_list = [ None,
server_has_mergeinfo),
XFail(SkipUnless(Skip(reintegrate_fails_if_no_root_access,
svntest.main.is_ra_type_file),
- svntest.main.server_has_mergeinfo)),
+ svntest.main.server_has_mergeinfo),
+ svntest.main.is_ra_type_dav),
]
if __name__ == '__main__':
