You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/02/03 17:10:09 UTC

svn commit: r1066848 - /subversion/trunk/subversion/tests/cmdline/authz_tests.py

Author: cmpilato
Date: Thu Feb  3 16:10:09 2011
New Revision: 1066848

URL: http://svn.apache.org/viewvc?rev=1066848&view=rev
Log:
* subversion/tests/cmdline/authz_tests.py
  (authz_read_access): Rework some test logic to avoid possible human
    error later.

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

Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1066848&r1=1066847&r2=1066848&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Thu Feb  3 16:10:09 2011
@@ -156,6 +156,8 @@ def authz_read_access(sbox):
   pi_url = G_url + '/pi'
   H_url = D_url + '/H'
   chi_url = H_url + '/chi'
+  fws_url = B_url + '/folder with spaces'
+  fws_empty_folder_url = fws_url + '/empty folder'
 
   if sbox.repo_url.startswith("http"):
     expected_err = ".*[Ff]orbidden.*"
@@ -163,12 +165,9 @@ def authz_read_access(sbox):
     expected_err = ".*svn: E170001: Authorization failed.*"
 
   # create some folders with spaces in their names
-  svntest.actions.run_and_verify_svn(None, None, [],
-                                     'mkdir',
-                                     '-m', 'logmsg',
-                                     B_url+'/folder with spaces',
-                                     B_url+'/folder with spaces/empty folder')
-
+  svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', '-m', 'logmsg',
+                                     fws_url, fws_empty_folder_url)
+  
   write_restrictive_svnserve_conf(sbox.repo_dir)
 
   write_authz_file(sbox, { "/": "* = r",
@@ -222,7 +221,7 @@ def authz_read_access(sbox):
   # open a remote folder(ls) with spaces, should succeed
   svntest.actions.run_and_verify_svn(None,
                                      None, [], 'ls',
-                                     B_url+'/folder with spaces/empty folder')
+                                     fws_empty_folder_url)
 
   # open a remote folder(ls), unreadable through recursion: should fail
   svntest.actions.run_and_verify_svn(None,
@@ -265,12 +264,12 @@ def authz_read_access(sbox):
                                      'mv', '-m', 'logmsg',
                                      alpha_url, F_alpha_url)
 
-  # copy a remote file, source/target ancestor is readonly
-  ### we fail here due to issue #3242.
-  svntest.actions.run_and_verify_svn(None,
-                                     None, [],
-                                     'cp', '-m', 'logmsg',
-                                     alpha_url, F_alpha_url)
+  ## copy a remote file, source/target ancestor is readonly
+  ## we fail here due to issue #3242.
+  #svntest.actions.run_and_verify_svn(None,
+  #                                   None, [],
+  #                                   'cp', '-m', 'logmsg',
+  #                                   alpha_url, F_alpha_url)
 
 
 # test whether write access is correctly granted and denied