svn commit: r945651 - /subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py

[pb...@apache.org]

Author: pburba
Date: Tue May 18 13:50:04 2010
New Revision: 945651

URL: http://svn.apache.org/viewvc?rev=945651&view=rev
Log:
Tweak a merge_authz test to run properly over ra_svn (and fail as expected).

* subversion/tests/cmdline/merge_authz_tests.py

  (reintegrate_fails_if_no_root_access): Be sure to use restrictive authz
   when running over ra_serf.  Previously we wrote the restrictive authz,
   but didn't update svnserve.conf to use it, so the test XPassed.

  (test_list): Expect this to fail over ra_serf.  This reverts r945543.

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=945651&r1=945650&r2=945651&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Tue May 18 13:50:04 2010
@@ -627,6 +627,7 @@ def reintegrate_fails_if_no_root_access(
 
   # Change authz file so everybody has access to everything but the root.  
   if is_ra_type_svn() or is_ra_type_dav():
+    write_restrictive_svnserve_conf(sbox.repo_dir)
     write_authz_file(sbox, {"/"       : "* =",
                             "/A"      : "* = rw",
                             "/A_COPY" : "* = rw",
@@ -730,8 +731,7 @@ 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.is_ra_type_dav),
+                               svntest.main.server_has_mergeinfo)),
              ]
 
 if __name__ == '__main__':