Author: julianfoad
Date: Fri Dec 3 17:23:13 2010
New Revision: 1041920
URL: http://svn.apache.org/viewvc?rev=1041920&view=rev
Log:
Fix a test failure introduced by r1041900 (mixed URL and local targets to
'svn update'). Also note the relationship between this test and the new one.
* subversion/tests/cmdline/basic_tests.py
(basic_mkdir_mix_targets): Update the expected error message.
* subversion/tests/cmdline/input_validation_tests.py
(invalid_mkdir_targets): Cross-reference to basic_mkdir_mix_targets().
Modified:
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1041920&r1=1041919&r2=1041920&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Dec 3
17:23:13 2010
@@ -2486,12 +2486,14 @@ def basic_add_svn_format_file(sbox):
svntest.actions.run_and_verify_status(wc_dir, output)
# Issue 2586, Unhelpful error message: Unrecognized URL scheme for ''
+# See also input_validation_tests.py:invalid_mkdir_targets(), which tests
+# the same thing the other way around.
def basic_mkdir_mix_targets(sbox):
"mkdir mix url and local path should error"
sbox.build()
Y_url = sbox.repo_url + '/Y'
- expected_error = ".*Illegal repository URL 'subdir'"
+ expected_error = "svn: Cannot mix repository and working copy targets"
svntest.actions.run_and_verify_svn(None, None, expected_error,
'mkdir', '-m', 'log_msg', Y_url, 'subdir')
Modified: subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/input_validation_tests.py?rev=1041920&r1=1041919&r2=1041920&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/input_validation_tests.py Fri Dec
3 17:23:13 2010
@@ -234,6 +234,8 @@ def invalid_relocate_targets(sbox):
run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path", 'relocate',
"^/", "^/", "^/")
+# See also basic_tests.py:basic_mkdir_mix_targets(), which tests
+# the same thing the other way around.
def invalid_mkdir_targets(sbox):
"invalid targets for 'mkdir'"
sbox.build(read_only=True)
