Author: rhuijben
Date: Wed May 18 20:39:42 2011
New Revision: 1124414
URL: http://svn.apache.org/viewvc?rev=1124414&view=rev
Log:
* subversion/tests/cmdline/upgrade_tests.py
(logs_left_1_5): Following up on r1124375, update expected error message.
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=1124414&r1=1124413&r2=1124414&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Wed May 18
20:39:42 2011
@@ -318,8 +318,7 @@ def logs_left_1_5(sbox):
replace_sbox_with_tarfile(sbox, 'logs_left_1_5.tar.bz2')
# Try to upgrade, this should give an error
- expected_stderr = (".*Cannot upgrade with existing logs; please "
- "run 'svn cleanup' with Subversion 1.6")
+ expected_stderr = (".*Cannot upgrade with existing logs; .*")
svntest.actions.run_and_verify_svn(None, None, expected_stderr,
'upgrade', sbox.wc_dir)
