Author: stsp
Date: Fri Nov 2 02:17:14 2012
New Revision: 1404858
URL: http://svn.apache.org/viewvc?rev=1404858&view=rev
Log:
* subversion/tests/cmdline/upgrade_tests.py
(basic_upgrade): For some reason we must expect SVN_ERR_WC_NOT_DIRECTORY
as well to make the windows buildbot happy. I suspect this has to do with
out-of-tree test suite runs, rather than with the OS platform.
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=1404858&r1=1404857&r2=1404858&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Fri Nov 2
02:17:14 2012
@@ -265,7 +265,7 @@ def basic_upgrade(sbox):
# 'not a working copy root' error. Upgrade on something without any
# versioned parent gives a 'not a working copy' error.
# Both cases use the same error code.
- not_wc = ".*E155019.*%s'.*not a working copy.*"
+ not_wc = ".*(E155007|E155019).*%s'.*not a working copy.*"
os.mkdir(sbox.ospath('X'))
svntest.actions.run_and_verify_svn(None, None, not_wc % 'X',
'upgrade', sbox.ospath('X'))
