Author: rhuijben
Date: Fri Jun 3 16:19:19 2011
New Revision: 1131091
URL: http://svn.apache.org/viewvc?rev=1131091&view=rev
Log:
* subversion/tests/cmdline/upgrade_tests.py
(basic_upgrade): Following up on r1131000, escape paths in error messages
to fix this test on Windows.
Modified:
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=1131091&r1=1131090&r2=1131091&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Fri Jun 3
16:19:19 2011
@@ -252,12 +252,14 @@ def basic_upgrade(sbox):
svntest.actions.run_and_verify_svn(None, None, not_dir % 'Y',
'upgrade', sbox.ospath('Y'))
- svntest.actions.run_and_verify_svn(None, None, not_dir % 'A/mu',
+ svntest.actions.run_and_verify_svn(None, None, not_dir %
+ re.escape(sbox.ospath('A/mu')),
'upgrade', sbox.ospath('A/mu'))
# Upgrade on a versioned subdir gives a 'not root' error.
not_root = ".*E155019.*%s'.*root.*%s'"
- svntest.actions.run_and_verify_svn(None, None, not_root % ('A', sbox.wc_dir),
+ svntest.actions.run_and_verify_svn(None, None, not_root %
+ ('A', re.escape(sbox.wc_dir)),
'upgrade', sbox.ospath('A'))
# Now upgrade the working copy
