subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1553878 - /subversion/trunk/subversion/tests/cmdline/update_tests.py
Date Sat, 28 Dec 2013 17:48:33 GMT
Author: rhuijben
Date: Sat Dec 28 17:48:32 2013
New Revision: 1553878

URL: http://svn.apache.org/r1553878
Log:
* subversion/tests/cmdline/update_tests.py
  (windows_update_backslash): Somehow the Apache Httpd behavior is now that it
    automatically server excludes paths containing '\\' when running on
    Windows. Lets not call that XFails, shall we, as it allows actually using
    such a working copy.

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

Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1553878&r1=1553877&r2=1553878&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Sat Dec 28 17:48:32 2013
@@ -6561,7 +6561,6 @@ def move_update_props(sbox):
 
 @Issues(3288)
 @SkipUnless(svntest.main.is_os_windows)
-@XFail(svntest.main.is_ra_type_dav)
 def windows_update_backslash(sbox):
   "test filename with backslashes inside"
 
@@ -6569,17 +6568,43 @@ def windows_update_backslash(sbox):
 
   wc_dir = sbox.wc_dir
 
+  mucc_url = sbox.repo_url
+
+  if mucc_url.startswith('http'):
+    # Apache Httpd doesn't allow creating paths with '\\' in them on Windows
+    # AH00026: found %2f (encoded '/') in URI (decoded='/svn-test-work/repositories/authz_tests-30/!svn/ver/2/A/completely\\unusable\\dir'),
returning 404
+    #
+    # Let's use file:// to work around.
+    mucc_url = 'file:///' + os.path.abspath(sbox.repo_dir).replace('\\', '/')
+
   svntest.actions.run_and_verify_svnmucc(None, None, [],
-                    '-U', sbox.repo_url,
+                    '-U', mucc_url,
                     '-m', '',
                     'mkdir', 'A/completely\\unusable\\dir')
 
   # No error and a proper skip + recording in the working copy would also
   # be a good result. This just verifies current behavior.
 
-  expected_error = 'svn: E155000: .* is not valid.*'
-  svntest.actions.run_and_verify_svn(wc_dir, None, expected_error, 'up',
-                                     wc_dir)
+  if sbox.repo_url.startswith('http'):
+    # Apache Httpd doesn't allow paths with '\\' in them on Windows, so the
+    # test if a user is allowed to read them returns a failure. This makes
+    # mod_dav_svn report the path as server excluded (aka absent), which
+    # doesn't produce output when updating.
+    expected_output = [
+      "Updating '%s':\n" % wc_dir,
+      "At revision 2.\n"
+    ]
+    expected_err = []
+  else:
+    expected_output = None
+    expected_err = 'svn: E155000: .* is not valid.*'
+
+  svntest.actions.run_and_verify_svn(wc_dir, expected_output, expected_err,
+                                     'up', wc_dir)
+
+  if sbox.repo_url.startswith('http'):
+    expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
+    svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
 def update_moved_away(sbox):
   "update subtree of moved away"



Mime
View raw message