You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/01/27 13:24:35 UTC
svn commit: r1655019 -
/subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py
Author: stsp
Date: Tue Jan 27 12:24:35 2015
New Revision: 1655019
URL: http://svn.apache.org/r1655019
Log:
On the pin-externals branch, fix non-portable use of paths in regression test.
* subversion/tests/cmdline/externals_tests.py
(copy_pin_externals): Use os.path.join(wc_dir, 'foo') instead of the
non-portable idiom wc_dir + '/foo'. Not all platforms use a forward
slash as path separator.
Modified:
subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py
Modified: subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py?rev=1655019&r1=1655018&r2=1655019&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/externals_tests.py Tue Jan 27 12:24:35 2015
@@ -3629,7 +3629,7 @@ def copy_pin_externals(sbox):
svntest.actions.run_and_verify_svn(None, None, [],
'copy',
repo_url + '/A',
- wc_dir + '/A_copy',
+ os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
verify_pinned_externals(wc_dir)
@@ -3641,7 +3641,7 @@ def copy_pin_externals(sbox):
# Perform a wc->repos copy, pinning externals
svntest.actions.run_and_verify_svn(None, None, [],
'copy',
- wc_dir + '/A',
+ os.path.join(wc_dir, 'A'),
repo_url + '/A_copy',
'-m', 'copy',
'--pin-externals')
@@ -3655,8 +3655,8 @@ def copy_pin_externals(sbox):
# Perform a wc->wc copy, pinning externals
svntest.actions.run_and_verify_svn(None, None, [],
'copy',
- wc_dir + '/A',
- wc_dir + '/A_copy',
+ os.path.join(wc_dir, 'A'),
+ os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
verify_pinned_externals(wc_dir)
@@ -3673,8 +3673,8 @@ def copy_pin_externals(sbox):
sbox.simple_update()
svntest.actions.run_and_verify_svn(None, None, [],
'copy',
- wc_dir + '/A',
- wc_dir + '/A_copy',
+ os.path.join(wc_dir, 'A'),
+ os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
# gamma was moved so its path and expected last-changed revision change
last_changed_rev_gamma = 11
@@ -3693,8 +3693,8 @@ def copy_pin_externals(sbox):
sbox.simple_update()
svntest.actions.run_and_verify_svn(None, None, [],
'copy',
- wc_dir + '/A',
- wc_dir + '/A_copy',
+ os.path.join(wc_dir, 'A'),
+ os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
# While gamma's path has changed by virtue of being moved along with
# its parent A/D, gamma's last-changed rev should not have changed.
@@ -3720,8 +3720,8 @@ def copy_pin_externals(sbox):
sbox.simple_update()
svntest.actions.run_and_verify_svn(None, None, [],
'copy',
- wc_dir + '/A',
- wc_dir + '/A_copy',
+ os.path.join(wc_dir, 'A'),
+ os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
last_changed_rev_A = 6
verify_pinned_externals(wc_dir)
@@ -3741,8 +3741,8 @@ def copy_pin_externals(sbox):
# Test a copy from an old revision with pinning.
svntest.actions.run_and_verify_svn(None, None, [],
'copy',
- wc_dir + '/A@6',
- wc_dir + '/A_copy',
+ os.path.join(wc_dir, 'A@6'),
+ os.path.join(wc_dir, 'A_copy'),
'--pin-externals')
last_changed_rev_gamma = 1
A_copy_D_path = 'A_copy/D'