You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/09/07 18:07:48 UTC
svn commit: r1701646 -
/subversion/trunk/subversion/tests/cmdline/lock_tests.py
Author: rhuijben
Date: Mon Sep 7 16:07:48 2015
New Revision: 1701646
URL: http://svn.apache.org/r1701646
Log:
Following up on r1701598, further update lock expectations. In this case to
fix a specific non maintainer mode error text.
* subversion/tests/cmdline/lock_tests.py
(lock_hook_messages): Expect summary at end of error.
Modified:
subversion/trunk/subversion/tests/cmdline/lock_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1701646&r1=1701645&r2=1701646&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Mon Sep 7 16:07:48 2015
@@ -1925,10 +1925,11 @@ def lock_hook_messages(sbox):
[], svntest.verify.AnyOutput,
'lock', mu_url)
if len(actual_stderr) > 4:
- actual_stderr = actual_stderr[-4:-2]
+ actual_stderr = actual_stderr[-4:-2] + actual_stderr[-1:]
expected_err = [
'svn: warning: W165001: ' + svntest.actions.hook_failure_message('pre-lock'),
error_msg + "\n",
+ "svn: E200009: One or more locks could not be obtained\n",
]
svntest.verify.compare_and_display_lines(None, 'STDERR',
expected_err, actual_stderr)
@@ -1938,10 +1939,11 @@ def lock_hook_messages(sbox):
[], svntest.verify.AnyOutput,
'unlock', iota_url)
if len(actual_stderr) > 4:
- actual_stderr = actual_stderr[-4:-2]
+ actual_stderr = actual_stderr[-4:-2] + actual_stderr[-1:]
expected_err = [
'svn: warning: W165001: ' + svntest.actions.hook_failure_message('pre-unlock'),
error_msg + "\n",
+ "svn: E200009: One or more locks could not be released\n",
]
svntest.verify.compare_and_display_lines(None, 'STDERR',
expected_err, actual_stderr)