Author: danielsh
Date: Wed May 31 22:07:22 2017
New Revision: 1797123
URL: http://svn.apache.org/viewvc?rev=1797123&view=rev
Log:
* subversion/tests/cmdline/svnadmin_tests.py
(locking): Extend test expectations to match another part of the output.
While here, make a small clarification to the codepath that caused the
incumbent code to work:
* subversion/tests/cmdline/svntest/verify.py
(ExpectedOutput.__init__): Point to the external constructor.
Found by: julianfoad
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/verify.py
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1797123&r1=1797122&r2=1797123&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Wed May 31
22:07:22 2017
@@ -1958,7 +1958,7 @@ def locking(sbox):
# Test unlocking the path again, but this time provide the correct
# lock token.
- expected_output = "'/A/D/G/rho' unlocked."
+ expected_output = "'/A/D/G/rho' unlocked by user 'jrandom'."
svntest.actions.run_and_verify_svnadmin(expected_output,
None, "unlock",
sbox.repo_dir,
@@ -2004,7 +2004,7 @@ def locking(sbox):
# Finally, use --bypass-hooks to unlock the path (again using the
# correct lock token).
- expected_output = "'/iota' unlocked."
+ expected_output = "'/iota' unlocked by user 'jrandom'."
svntest.actions.run_and_verify_svnadmin(expected_output,
None, "unlock",
"--bypass-hooks",
Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1797123&r1=1797122&r2=1797123&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Wed May 31
22:07:22 2017
@@ -109,6 +109,8 @@ class ExpectedOutput(object):
def __init__(self, expected, match_all=True):
"""Initialize the expected output to EXPECTED which is a string, or
a list of strings.
+
+ See also: svntest.verify.createExpectedOutput().
"""
assert expected is not None
self.expected = expected
