You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/01/28 06:57:54 UTC
svn commit: r1064467 - /subversion/trunk/subversion/tests/cmdline/
Author: danielsh
Date: Fri Jan 28 05:57:53 2011
New Revision: 1064467
URL: http://svn.apache.org/viewvc?rev=1064467&view=rev
Log:
Fix tests broken by r1064458 by updating the expected output.
This makes the test check the apr_err return by the library --- except for
those cases where both the cmdline client and the library do a validation,
where it just checks that the cmdline client *still* returns E205000.
In one case, the current output is
"svn: Skipping argument: E123456: '.+' ends in a reserved name".
* subversion/tests/cmdline/cat_tests.py
* subversion/tests/cmdline/changelist_tests.py
* subversion/tests/cmdline/diff_tests.py
* subversion/tests/cmdline/autoprop_tests.py
* subversion/tests/cmdline/input_validation_tests.py
* subversion/tests/cmdline/prop_tests.py
* subversion/tests/cmdline/special_tests.py
* subversion/tests/cmdline/update_tests.py
* subversion/tests/cmdline/commit_tests.py
* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/lock_tests.py
* subversion/tests/cmdline/switch_tests.py
* subversion/tests/cmdline/stat_tests.py
* subversion/tests/cmdline/basic_tests.py
* subversion/tests/cmdline/merge_reintegrate_tests.py
* subversion/tests/cmdline/schedule_tests.py
* subversion/tests/cmdline/depth_tests.py
Update expected output.
Modified:
subversion/trunk/subversion/tests/cmdline/autoprop_tests.py
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/cat_tests.py
subversion/trunk/subversion/tests/cmdline/changelist_tests.py
subversion/trunk/subversion/tests/cmdline/commit_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/diff_tests.py
subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
subversion/trunk/subversion/tests/cmdline/lock_tests.py
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/prop_tests.py
subversion/trunk/subversion/tests/cmdline/schedule_tests.py
subversion/trunk/subversion/tests/cmdline/special_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/autoprop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/autoprop_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/autoprop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/autoprop_tests.py Fri Jan 28 05:57:53 2011
@@ -307,7 +307,7 @@ def fail_add_mixed_eol_style(sbox):
svntest.main.file_write(filepath, 'foo\nbar\r\nbaz\r')
- expected_stderr = "svn: File '.*/" + filename + \
+ expected_stderr = "svn: E200009: File '.*/" + filename + \
"' has inconsistent newlines" + \
"|" + "svn: Inconsistent line ending style\n"
run_and_verify_svn(None, [], expected_stderr,
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Jan 28 05:57:53 2011
@@ -397,7 +397,8 @@ def basic_corruption(sbox):
# This commit should fail due to text base corruption.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, "svn: Checksum",
+ expected_status,
+ "svn: E155017: Checksum",
wc_dir)
# Restore the uncorrupted text base.
@@ -446,7 +447,7 @@ def basic_corruption(sbox):
expected_output,
expected_disk,
expected_status,
- "svn: Checksum", other_wc)
+ "svn: E155017: Checksum", other_wc)
# Restore the uncorrupted text base.
os.chmod(tb_dir_path, 0777)
@@ -2484,7 +2485,7 @@ def basic_mkdir_mix_targets(sbox):
sbox.build()
Y_url = sbox.repo_url + '/Y'
- expected_error = "svn: Cannot mix repository and working copy targets"
+ expected_error = "svn: E200009: 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/cat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/cat_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/cat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/cat_tests.py Fri Jan 28 05:57:53 2011
@@ -113,12 +113,12 @@ def cat_skip_uncattable(sbox):
continue
item_to_cat = os.path.join(dir_path, file)
if item_to_cat == new_file_path:
- expected_err = ["svn: warning: '" + os.path.abspath(item_to_cat) + "'" + \
+ expected_err = ["svn: warning: W200005: '" + os.path.abspath(item_to_cat) + "'" + \
" is not under version control\n"]
svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
'cat', item_to_cat)
elif os.path.isdir(item_to_cat):
- expected_err = ["svn: warning: '" + os.path.abspath(item_to_cat) + "'" + \
+ expected_err = ["svn: warning: W195007: '" + os.path.abspath(item_to_cat) + "'" + \
" refers to a directory\n"]
svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
'cat', item_to_cat)
@@ -131,12 +131,12 @@ def cat_skip_uncattable(sbox):
rho_path = os.path.join(G_path, 'rho')
expected_out = ["This is the file 'rho'.\n"]
- expected_err1 = ["svn: warning: '" + os.path.abspath(G_path) + "'"
+ expected_err1 = ["svn: warning: W195007: '" + os.path.abspath(G_path) + "'"
+ " refers to a directory\n"]
svntest.actions.run_and_verify_svn2(None, expected_out, expected_err1, 0,
'cat', rho_path, G_path)
- expected_err2 = ["svn: warning: '" + os.path.abspath(new_file_path) + "'"
+ expected_err2 = ["svn: warning: W200005: '" + os.path.abspath(new_file_path) + "'"
+ " is not under version control\n"]
svntest.actions.run_and_verify_svn2(None, expected_out, expected_err2, 0,
'cat', rho_path, new_file_path)
@@ -162,7 +162,7 @@ def cat_unversioned_file(sbox):
iota_path)
# Now try to cat the deleted file, it should be reported as unversioned.
- expected_error = ["svn: warning: '" + os.path.abspath(iota_path) + "'"
+ expected_error = ["svn: warning: W200005: '" + os.path.abspath(iota_path) + "'"
+ " is not under version control\n"]
svntest.actions.run_and_verify_svn2(None, [], expected_error, 0,
'cat', iota_path)
@@ -204,7 +204,7 @@ def cat_url_special_characters(sbox):
special_urls = [sbox.repo_url + '/A' + '/%2E',
sbox.repo_url + '%2F' + 'A']
- expected_err = ["svn: warning: URL '" + sbox.repo_url + '/A' + "'"
+ expected_err = ["svn: warning: W195007: URL '" + sbox.repo_url + '/A' + "'"
+ " refers to a directory\n"]
for url in special_urls:
Modified: subversion/trunk/subversion/tests/cmdline/changelist_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/changelist_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/changelist_tests.py Fri Jan 28 05:57:53 2011
@@ -871,7 +871,7 @@ def tree_conflicts_and_changelists_on_co
# item.
svntest.main.run_svn(None, "changelist", "list", iota, rho)
- expected_error = ("svn: Aborting commit: '.*" + re.escape(rho)
+ expected_error = ("svn: E155015: Aborting commit: '.*" + re.escape(rho)
+ "' remains in .*conflict")
svntest.actions.run_and_verify_commit(wc_dir,
@@ -960,7 +960,7 @@ def tree_conflicts_and_changelists_on_co
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Verify that the current situation does not commit.
- expected_error = "svn: Aborting commit:.* remains in .*conflict";
+ expected_error = "svn: E155015: Aborting commit:.* remains in .*conflict";
svntest.actions.run_and_verify_commit(wc_dir,
None, None,
@@ -1043,7 +1043,7 @@ def tree_conflicts_and_changelists_on_co
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Verify that the current situation does not commit.
- expected_error = "svn: Aborting commit:.* remains in .*conflict";
+ expected_error = "svn: E155015: Aborting commit:.* remains in .*conflict";
svntest.actions.run_and_verify_commit(wc_dir,
None, None,
Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Fri Jan 28 05:57:53 2011
@@ -1273,7 +1273,8 @@ def commit_with_lock(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- 'svn: Working copy \'.*\' locked',
+ 'svn: E155004: '
+ 'Working copy \'.*\' locked',
wc_dir)
# unlock directory
@@ -2445,7 +2446,8 @@ def set_invalid_revprops(sbox):
# Empty revprop pair.
svntest.actions.run_and_verify_svn(None, [],
- 'svn: Revision property pair is empty',
+ 'svn: E205000: '
+ 'Revision property pair is empty',
'mkdir', '-m', 'msg',
'--with-revprop', '',
remote_dir)
@@ -2482,7 +2484,7 @@ def start_commit_hook_test(sbox):
# contain source code file and line numbers.
if len(actual_stderr) > 2:
actual_stderr = actual_stderr[-2:]
- expected_stderr = [ "svn: " +
+ expected_stderr = [ "svn: E165001: " +
svntest.actions.hook_failure_message('start-commit'),
error_msg + "\n",
]
@@ -2522,7 +2524,7 @@ def pre_commit_hook_test(sbox):
# contain source code file and line numbers.
if len(actual_stderr) > 2:
actual_stderr = actual_stderr[-2:]
- expected_stderr = [ "svn: " +
+ expected_stderr = [ "svn: E165001: " +
svntest.actions.hook_failure_message('pre-commit'),
error_msg + "\n",
]
@@ -2676,7 +2678,7 @@ def commit_url(sbox):
url = sbox.repo_url
# Commit directly to a URL
- expected_error = ("svn: '" + url +
+ expected_error = ("svn: E205000: '" + url +
"' is a URL, but URLs cannot be commit targets")
svntest.actions.run_and_verify_commit(None,
None,
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Fri Jan 28 05:57:53 2011
@@ -2334,7 +2334,7 @@ def exclude_keeps_hidden_entries(sbox):
svntest.main.run_svn(None, 'up', '--set-depth', 'exclude', 'D')
# we could grep the 'entries' file, but...
# or we could use 'info', but info_excluded() is XFail.
- expected_stderr = ".*svn: '.*C' is already under version control.*"
+ expected_stderr = ".*svn: E150002: '.*C' is already under version control.*"
svntest.actions.run_and_verify_svn(None, None, expected_stderr,
'mkdir', 'C')
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Jan 28 05:57:53 2011
@@ -1235,7 +1235,7 @@ def diff_targets(sbox):
update_path,
add_path)
- regex = 'svn: Unable to find repository location for \'.*\''
+ regex = 'svn: E195012: Unable to find repository location for \'.*\''
for line in err_output:
if re.match(regex, line):
break
@@ -1254,7 +1254,7 @@ def diff_targets(sbox):
exit_code, diff_output, err_output = svntest.main.run_svn(
1, 'diff', '-r1:2', '--old', parent_path, 'alpha', 'theta')
- regex = 'svn: \'.*\' was not found in the repository'
+ regex = 'svn: E160013: \'.*\' was not found in the repository'
for line in err_output:
if re.match(regex, line):
break
@@ -3240,7 +3240,7 @@ def diff_wrong_extension_type(sbox):
"'svn diff -x wc -r#' should return error"
sbox.build(read_only = True)
- expected_error = "(.*svn: Invalid argument .* in diff options.*)|" \
+ expected_error = "(.*svn: E200016: Invalid argument .* in diff options.*)|" \
"(svn: '.' is not a working copy)"
svntest.actions.run_and_verify_svn(None, [], expected_error,
'diff', '-x', sbox.wc_dir, '-r', '1')
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=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/input_validation_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/input_validation_tests.py Fri Jan 28 05:57:53 2011
@@ -87,14 +87,14 @@ def invalid_wcpath_commit(sbox):
"non-working copy paths for 'commit'"
sbox.build(read_only=True)
for target in _invalid_wc_path_targets:
- run_and_verify_svn_in_wc(sbox, "svn: '.*' is a URL, but URLs cannot be " +
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: '.*' is a URL, but URLs cannot be " +
"commit targets", 'commit', target)
def invalid_copy_sources(sbox):
"invalid sources for 'copy'"
sbox.build(read_only=True)
for (src1, src2) in [("iota", "^/"), ("^/", "iota"), ("file://", "iota")]:
- run_and_verify_svn_in_wc(sbox, "svn: Cannot mix repository and working " +
+ run_and_verify_svn_in_wc(sbox, "svn: E200007: Cannot mix repository and working " +
"copy sources", 'copy', src1, src2, "A")
def invalid_copy_target(sbox):
@@ -102,30 +102,30 @@ def invalid_copy_target(sbox):
sbox.build(read_only=True)
mu_path = os.path.join('A', 'mu')
C_path = os.path.join('A', 'C')
- run_and_verify_svn_in_wc(sbox, "svn: Path '.*' is not a directory",
+ run_and_verify_svn_in_wc(sbox, "svn: E155007: Path '.*' is not a directory",
'copy', mu_path, C_path, "iota")
def invalid_delete_targets(sbox):
"invalid targets for 'delete'"
sbox.build(read_only=True)
for (target1, target2) in [("iota", "^/"), ("file://", "iota")]:
- run_and_verify_svn_in_wc(sbox, "svn: Cannot mix repository and working "
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Cannot mix repository and working "
"copy targets", 'delete', target1, target2)
def invalid_diff_targets(sbox):
"invalid targets for 'diff'"
sbox.build(read_only=True)
for (target1, target2) in [("iota", "^/"), ("file://", "iota")]:
- run_and_verify_svn_in_wc(sbox, "svn: Cannot mix repository and working "
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Cannot mix repository and working "
"copy targets", 'diff', target1, target2)
- run_and_verify_svn_in_wc(sbox, "svn: Summarizing diff can only compare "
+ run_and_verify_svn_in_wc(sbox, "svn: E200007: Summarizing diff can only compare "
"repository to repository",
'diff', '--summarize', "iota", "A")
def invalid_export_targets(sbox):
"invalid targets for 'export'"
sbox.build(read_only=True)
- run_and_verify_svn_in_wc(sbox, "svn: Can't create directory 'iota':.*",
+ run_and_verify_svn_in_wc(sbox, "svn: E000017: Can't create directory 'iota':.*",
'export', '.', 'iota')
for target in ["^/", "file://"]:
run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path",
@@ -138,32 +138,32 @@ def invalid_import_args(sbox):
'import', '^/', '^/')
run_and_verify_svn_in_wc(sbox, "svn:.*is not a local path",
'import', '^/', 'iota')
- run_and_verify_svn_in_wc(sbox, "svn: Invalid URL 'iota'",
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Invalid URL 'iota'",
'import', 'iota', 'iota')
def invalid_log_targets(sbox):
"invalid targets for 'log'"
sbox.build(read_only=True)
for (target1, target2) in [('^/', '/a/b/c'), ('^/', '^/'), ('^/', 'file://')]:
- run_and_verify_svn_in_wc(sbox, "svn: Only relative paths can be " +
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Only relative paths can be " +
"specified after a URL for 'svn log', but.*is " +
"not a relative path", 'log', target1, target2)
def invalid_merge_args(sbox):
"invalid arguments for 'merge'"
sbox.build(read_only=True)
- run_and_verify_svn_in_wc(sbox, "svn: A working copy merge source needs "
+ run_and_verify_svn_in_wc(sbox, "svn: E195002: A working copy merge source needs "
"an explicit revision", 'merge', 'iota', '^/')
for (src, target) in [('iota@HEAD', '^/'), ('iota@BASE', 'file://')]:
- run_and_verify_svn_in_wc(sbox, "svn: Merge sources must both be either "
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Merge sources must both be either "
"paths or URLs", 'merge', src, target)
- run_and_verify_svn_in_wc(sbox, "svn: Path '.*' does not exist",
+ run_and_verify_svn_in_wc(sbox, "svn: E155010: Path '.*' does not exist",
'merge', 'iota@BASE', 'iota@HEAD', 'nonexistent')
- run_and_verify_svn_in_wc(sbox, "svn: Too many arguments given",
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Too many arguments given",
'merge', '-c42', '^/A/B', '^/A/C', 'iota')
- run_and_verify_svn_in_wc(sbox, "svn: Cannot specify a revision range with" +
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Cannot specify a revision range with" +
" two URLs", 'merge', '-c42', '^/mu', '^/')
- run_and_verify_svn_in_wc(sbox, "svn: Path '.*' does not exist",
+ run_and_verify_svn_in_wc(sbox, "svn: E155010: Path '.*' does not exist",
'merge', '-c42', '^/mu', 'nonexistent')
def invalid_wcpath_upgrade(sbox):
@@ -198,14 +198,14 @@ def invalid_lock_targets(sbox):
"wc paths and repo URL target mixture for 'lock'"
sbox.build(read_only=True)
for (target1, target2) in [("iota", "^/"), ("file://", "iota")]:
- run_and_verify_svn_in_wc(sbox, "svn: Cannot mix repository and working "
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Cannot mix repository and working "
"copy targets", 'lock', target1, target2)
def invalid_unlock_targets(sbox):
"wc paths and repo URL target mixture for 'unlock'"
sbox.build(read_only=True)
for (target1, target2) in [("iota", "^/"), ("file://", "iota")]:
- run_and_verify_svn_in_wc(sbox, "svn: Cannot mix repository and working "
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Cannot mix repository and working "
"copy targets", 'unlock', target1, target2)
def invalid_status_targets(sbox):
@@ -239,7 +239,7 @@ def invalid_relocate_targets(sbox):
def invalid_mkdir_targets(sbox):
"invalid targets for 'mkdir'"
sbox.build(read_only=True)
- run_and_verify_svn_in_wc(sbox, "svn: Cannot mix repository and working "
+ run_and_verify_svn_in_wc(sbox, "svn: E205000: Cannot mix repository and working "
"copy targets", 'mkdir', "folder", "^/folder")
def invalid_update_targets(sbox):
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Fri Jan 28 05:57:53 2011
@@ -359,7 +359,7 @@ def enforce_lock(sbox):
# svn:needs-lock value should be forced to a '*'
svntest.actions.set_prop('svn:needs-lock', 'foo', iota_path)
svntest.actions.set_prop('svn:needs-lock', '*', lambda_path)
- expected_err = ".*svn: warning: To turn off the svn:needs-lock property,.*"
+ expected_err = ".*svn: warning: W125005: To turn off the svn:needs-lock property,.*"
svntest.actions.set_prop('svn:needs-lock', ' ', mu_path, expected_err)
# Check svn:needs-lock
@@ -967,11 +967,11 @@ def lock_and_exebit1(sbox):
gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
- expected_err = ".*svn: warning: To turn off the svn:needs-lock property,.*"
+ expected_err = ".*svn: warning: W125005: To turn off the svn:needs-lock property,.*"
svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
'ps', 'svn:needs-lock', ' ', gamma_path)
- expected_err = ".*svn: warning: To turn off the svn:executable property,.*"
+ expected_err = ".*svn: warning: W125005: To turn off the svn:executable property,.*"
svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
'ps', 'svn:executable', ' ', gamma_path)
@@ -1043,11 +1043,11 @@ def lock_and_exebit2(sbox):
gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
- expected_err = ".*svn: warning: To turn off the svn:needs-lock property,.*"
+ expected_err = ".*svn: warning: W125005: To turn off the svn:needs-lock property,.*"
svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
'ps', 'svn:needs-lock', ' ', gamma_path)
- expected_err = ".*svn: warning: To turn off the svn:executable property,.*"
+ expected_err = ".*svn: warning: W125005: To turn off the svn:executable property,.*"
svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
'ps', 'svn:executable', ' ', gamma_path)
@@ -1390,7 +1390,7 @@ def unlocked_lock_of_other_user(sbox):
if sbox.repo_url.startswith("http"):
expected_err = ".*403 Forbidden.*"
else:
- expected_err = "svn: warning: User '%s' is trying to use a lock owned by "\
+ expected_err = "svn: warning: W160039: User '%s' is trying to use a lock owned by "\
"'%s'.*" % (svntest.main.wc_author2, svntest.main.wc_author)
svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
'unlock',
Modified: subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py Fri Jan 28 05:57:53 2011
@@ -1219,7 +1219,7 @@ def reintegrate_with_subtree_mergeinfo(s
svntest.verify.verify_outputs("Reintegrate failed but not "
"in the way expected",
err, None,
- "(svn: Reintegrate can only be used if "
+ "(svn: E195016: Reintegrate can only be used if "
"revisions 2 through 15 were previously "
"merged from .*/A to the reintegrate source, "
"but this is not the case:\n)"
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Fri Jan 28 05:57:53 2011
@@ -16078,7 +16078,7 @@ def merge_with_os_deleted_subtrees(sbox)
re_sep = os.sep
# Common part of the expected error message for all cases we will test.
- err_re = "svn: Merge tracking not allowed with missing subtrees; " + \
+ err_re = "svn: E195016: Merge tracking not allowed with missing subtrees; " + \
"try restoring these items first:" + \
"|(\n)" + \
"|(.*apr_err.*\n)" # In case of debug build
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Fri Jan 28 05:57:53 2011
@@ -674,18 +674,18 @@ def inappropriate_props(sbox):
# ...grammatically incorrect
svntest.actions.run_and_verify_svn('illegal grammar', None,
- "svn: Pathname not terminated by ':'\n",
+ "svn: E200020: Pathname not terminated by ':'\n",
'propset', SVN_PROP_MERGEINFO, '/trunk',
path)
svntest.actions.run_and_verify_svn('illegal grammar', None,
- "svn: Invalid revision number found "
+ "svn: E200022: Invalid revision number found "
"parsing 'one'\n",
'propset', SVN_PROP_MERGEINFO,
'/trunk:one', path)
# ...contain overlapping revision ranges of differing inheritability.
svntest.actions.run_and_verify_svn('overlapping ranges', None,
- "svn: Unable to parse overlapping "
+ "svn: E200020: Unable to parse overlapping "
"revision ranges '9-20\\*' and "
"'18-22' with different "
"inheritance types\n",
@@ -693,7 +693,7 @@ def inappropriate_props(sbox):
'/branch:5-7,9-20*,18-22', path)
svntest.actions.run_and_verify_svn('overlapping ranges', None,
- "svn: Unable to parse overlapping "
+ "svn: E200020: Unable to parse overlapping "
"revision ranges "
"(('3' and '3\\*')|('3\\*' and '3')) "
"with different "
@@ -704,21 +704,21 @@ def inappropriate_props(sbox):
# ...contain revision ranges with start revisions greater than or
# equal to end revisions.
svntest.actions.run_and_verify_svn('range start >= range end', None,
- "svn: Unable to parse reversed "
+ "svn: E200020: Unable to parse reversed "
"revision range '20-5'\n",
'propset', SVN_PROP_MERGEINFO,
'/featureX:4,20-5', path)
# ...contain paths mapped to empty revision ranges
svntest.actions.run_and_verify_svn('empty ranges', None,
- "svn: Mergeinfo for '/trunk' maps to "
+ "svn: E200020: Mergeinfo for '/trunk' maps to "
"an empty revision range\n",
'propset', SVN_PROP_MERGEINFO,
'/trunk:', path)
# ...contain non-inheritable ranges when the target is a file.
svntest.actions.run_and_verify_svn('empty ranges', None,
- "svn: Cannot set non-inheritable "
+ "svn: E200020: Cannot set non-inheritable "
"mergeinfo on a non-directory*",
'propset', SVN_PROP_MERGEINFO,
'/A/D/H/psi:1*', iota_path)
@@ -1711,7 +1711,7 @@ def post_revprop_change_hook(sbox):
# serf/neon/mod_dav_svn splits the "svn: hook failed" line
expected_error = svntest.verify.RegexOutput([
- '(svn: |)post-revprop-change hook failed',
+ '(svn: E165001: |)post-revprop-change hook failed',
error_msg + "\n",
], match_all = False)
Modified: subversion/trunk/subversion/tests/cmdline/schedule_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/schedule_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/schedule_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/schedule_tests.py Fri Jan 28 05:57:53 2011
@@ -671,7 +671,7 @@ def propset_on_deleted_should_fail(sbox)
svntest.actions.run_and_verify_svn(None, None, [], 'rm', iota)
- svntest.actions.run_and_verify_svn(None, None, "svn: Can't set propert.*",
+ svntest.actions.run_and_verify_svn(None, None, "svn: E155023: Can't set propert.*",
'ps', 'prop', 'val', iota)
Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Fri Jan 28 05:57:53 2011
@@ -153,7 +153,7 @@ def replace_file_with_symlink(sbox):
'log msg',
wc_dir)
- regex = 'svn: Commit failed'
+ regex = 'svn: E145001: Commit failed'
for line in stderr_lines:
if re.match(regex, line):
break
@@ -305,7 +305,7 @@ def replace_symlink_with_file(sbox):
'log msg',
wc_dir)
- regex = 'svn: Commit failed'
+ regex = 'svn: E145001: Commit failed'
for line in stderr_lines:
if re.match(regex, line):
break
@@ -624,7 +624,7 @@ def warn_on_reserved_name(sbox):
svntest.actions.run_and_verify_svn(
"Locking a file with a reserved name failed to result in an error",
None,
- ".*Skipping argument: '.+' ends in a reserved name.*",
+ ".*Skipping argument: E200025: '.+' ends in a reserved name.*",
'lock', reserved_path)
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Jan 28 05:57:53 2011
@@ -791,7 +791,7 @@ def status_on_unversioned_dotdot(sbox):
exit_code, out, err = svntest.main.run_svn(1, 'st', '..')
for line in err:
- if line.find('svn: warning: \'..\' is not a working copy') != -1:
+ if line.find('svn: warning: W155007: \'..\' is not a working copy') != -1:
break
else:
raise svntest.Failure
@@ -964,7 +964,7 @@ def status_unversioned_dir(sbox):
"status on unversioned dir (issue 2030)"
sbox.build(read_only = True)
dir = sbox.repo_dir
- expected_err = "svn: warning: '.*(/|\\\\)" + os.path.basename(dir) + \
+ expected_err = "svn: warning: W155007: '.*(/|\\\\)" + os.path.basename(dir) + \
"' is not a working copy"
svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
"status", dir, dir)
Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Jan 28 05:57:53 2011
@@ -193,7 +193,7 @@ def commit_routine_switching(wc_dir, ver
# same URL. We don't allow this.
svntest.actions.run_and_verify_commit(
wc_dir, None, None,
- "svn: Cannot commit both .* as they refer to the same URL$",
+ "svn: E195003: Cannot commit both .* as they refer to the same URL$",
wc_dir)
# Okay, that all taken care of, let's revert the A/D/G/pi path and
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1064467&r1=1064466&r2=1064467&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Jan 28 05:57:53 2011
@@ -2311,7 +2311,7 @@ def forced_update_failures(sbox):
# svn up --force wc_dir_backup/A/C
expected_error = (
- "svn: Failed to add directory .*I.*working copy with the same name "
+ "svn: E155000: Failed to add directory .*I.*working copy with the same name "
+ "already exists"
)
@@ -5092,7 +5092,7 @@ def update_wc_of_dir_to_rev_not_containi
# Try to update working copy of 'A' directory
svntest.actions.run_and_verify_svn(None, None,
- "svn: Target path '/A' does not exist",
+ "svn: E160005: Target path '/A' does not exist",
"up", other_wc_dir)
#----------------------------------------------------------------------