Author: rhuijben
Date: Fri Jul 29 19:17:26 2011
New Revision: 1152341
URL: http://svn.apache.org/viewvc?rev=1152341&view=rev
Log:
* subversion/tests/cmdline/copy_tests.py
(commit_copied_half_of_nested_move): Escape paths to fix test on Windows.
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=1152341&r1=1152340&r2=1152341&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Jul 29 19:17:26
2011
@@ -5498,8 +5498,8 @@ def commit_copied_half_of_nested_move(sb
# iota -> A/D/iota; verify we cannot commit just A/D
svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path)
expected_error = "svn: E200009: Cannot commit '.*%s' because it was " \
- "moved from '.*%s'" % (os.path.join(D_path, "iota"),
- iota_path)
+ "moved from '.*%s'" % (re.escape(sbox.ospath('A/D/iota')),
+ re.escape(iota_path))
svntest.actions.run_and_verify_svn(None, None, expected_error,
'commit', '-m', 'foo', D_path)
@@ -5507,9 +5507,9 @@ def commit_copied_half_of_nested_move(sb
C_path = sbox.ospath('A/C')
svntest.actions.run_and_verify_svn(None, None, [], 'mv', D_path, C_path)
- expected_error = "svn: E200009: Cannot commit '.*%s' because it was " \
- "moved from '.*%s'" % (os.path.join(C_path, "D"),
- D_path)
+ expected_error = "svn: E200009: Cannot commit '.*%s' because it was moved " \
+ "from '.*%s'" % (re.escape(os.path.join(C_path, "D")),
+ re.escape(D_path))
svntest.actions.run_and_verify_svn(None, None, expected_error,
'commit', '-m', 'foo', C_path)
@@ -5519,7 +5519,8 @@ def commit_copied_half_of_nested_move(sb
svntest.actions.run_and_verify_svn(None, None, [], 'mv', D_iota_path,
A_iota_path)
expected_error = "svn: E200009: Cannot commit '.*%s' because it was " \
- "moved from '.*%s'" % (A_iota_path, iota_path)
+ "moved from '.*%s'" % (re.escape(A_iota_path),
+ re.escape(iota_path))
svntest.actions.run_and_verify_svn(None, None, expected_error,
'commit', '-m', 'foo', A_iota_path)
