svn commit: r1600852 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py

[ko...@apache.org]

Author: kotkov
Date: Fri Jun  6 11:51:42 2014
New Revision: 1600852

URL: http://svn.apache.org/r1600852
Log:
Following up on r1560701, use a common way of creating the relocate target
in the copy_relocate() test.

* subversion/tests/cmdline/copy_tests.py
  (imports): Remove unused import.
  (copy_relocate): Call add_repo_path() instead of add_wc_path().  Test
    repositories should be located under 'svn-test-work/repositories', not
    under 'svn-test-work/working_copies'.  Drop the handmade file:// URI
    construction, because it is no longer necessary.  As a consequence,
    this test now runs against three protocols (file://, svn://, http://),
    which is better, because all of them fail without r1560690.  The
    behavior of this test with file://, however, remains exactly the same.

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

Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1600852&r1=1600851&r2=1600852&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Jun  6 11:51:42 2014
@@ -25,7 +25,7 @@
 ######################################################################
 
 # General modules
-import stat, os, re, shutil, logging, sys
+import stat, os, re, shutil, logging
 
 logger = logging.getLogger()
 
@@ -5793,17 +5793,10 @@ def copy_relocate(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  tmp_dir = sbox.add_wc_path('relocated')
+  tmp_dir, url = sbox.add_repo_path('relocated')
 
   shutil.copytree(sbox.repo_dir, tmp_dir)
 
-  url = 'file://'
-
-  if sys.platform == 'win32':
-    url += '/'
-
-  url += os.path.abspath(tmp_dir).replace(os.path.sep, '/')
-
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'relocate', url, wc_dir)