Hello there,

I got quite a lot of test failures when running the subversion test suite (on windows) against a remote repository like svn://localhost/. After some investigation it tuns out that the test suite adds an extra '/' when combining the url with the test area location. So the url looked like svn://localhost//svn-work.. The tests do run fine, but obviously fails where the url gets compared with the url you get back from the server.

The following patch fixed it for me. Please note that I tested again 1.7.3, but since the test applies fine on trunk I guess it is an issue there as well. Please ignore this patch if it isn't the case :)

Regards,
Jens

[[[
Fix several test cases against a remote repository caused by an extra slash in the test area remote url.

* subversion/tests/cmdline/svntest/main.py
Normalize url to have no trailing slash even if options are already set, which is the case when running the test suite from e.g. win_tests.py.

Patch by: jp7677{a}gmail.com
]]]
Index: subversion/tests/cmdline/svntest/main.py
===================================================================
--- subversion/tests/cmdline/svntest/main.py    (revision 1291067)
+++ subversion/tests/cmdline/svntest/main.py    (working copy)
@@ -1554,9 +1554,6 @@
     parser.error("test harness only supports server minor versions 3-7")
 
   if options.url:
-    if options.url[-1:] == '/': # Normalize url to have no trailing slash
-      options.test_area_url = options.url[:-1]
-    else:
       options.test_area_url = options.url
 
   return (parser, args)
@@ -1646,6 +1643,9 @@
   else:
     parser = _create_parser()
 
+  if options.test_area_url[-1:] == '/': # Normalize url to have no trailing 
slash
+    options.test_area_url = options.test_area_url[:-1]
+
   # parse the positional arguments (test nums, names)
   for arg in test_selection:
     appended = False

Reply via email to