You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/01/06 22:46:00 UTC
svn commit: r1228421 -
/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
Author: cmpilato
Date: Fri Jan 6 21:46:00 2012
New Revision: 1228421
URL: http://svn.apache.org/viewvc?rev=1228421&view=rev
Log:
* subversion/tests/cmdline/svnadmin_tests.py
(locking): Tweak a bunch of comments to improve clarity. In doing
so, fix some typos/copy-n-pastos noticed by danielsh.
Modified:
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.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=1228421&r1=1228420&r2=1228421&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Fri Jan 6 21:46:00 2012
@@ -1702,7 +1702,7 @@ def locking(sbox):
"non-existent", "jrandom",
comment_path)
- # Test locking a path with a specified token.
+ # Test locking a path while specifying a lock token.
expected_output = "'A/D/G/rho' locked by user 'jrandom'."
lock_token = "opaquelocktoken:01234567-89ab-cdef-89ab-cdef01234567"
svntest.actions.run_and_verify_svnadmin(None, expected_output,
@@ -1711,7 +1711,7 @@ def locking(sbox):
"A/D/G/rho", "jrandom",
comment_path, lock_token)
- # Test unlocking a patch with the wrong token.
+ # Test unlocking a path, but provide the wrong lock token.
expected_error = ".*svnadmin: E160040:.*"
wrong_lock_token = "opaquelocktoken:12345670-9ab8-defc-9ab8-def01234567c"
svntest.actions.run_and_verify_svnadmin(None, None,
@@ -1720,7 +1720,8 @@ def locking(sbox):
"A/D/G/rho", "jrandom",
wrong_lock_token)
- # Test unlocking a patch with the wrong token.
+ # Test unlocking the path again, but this time provide the correct
+ # lock token.
expected_output = "'A/D/G/rho' unlocked."
svntest.actions.run_and_verify_svnadmin(None, expected_output,
None, "unlock",
@@ -1734,8 +1735,8 @@ def locking(sbox):
hook_path = svntest.main.get_pre_unlock_hook_path(sbox.repo_dir)
svntest.main.create_python_hook_script(hook_path, 'import sys; sys.exit(1)')
- # Test locking path without --bypass-hooks to see that hook script
- # is really getting executed.
+ # Test locking a path. Don't use --bypass-hooks, though, as we wish
+ # to verify that hook script is really getting executed.
expected_error = ".*svnadmin: E165001:.*"
svntest.actions.run_and_verify_svnadmin(None, None,
expected_error, "lock",
@@ -1743,7 +1744,8 @@ def locking(sbox):
"iota", "jrandom",
comment_path)
- # Fetch the lock token for our remaining locked path.
+ # Fetch the lock token for our remaining locked path. (We didn't
+ # explicitly set it, so it will vary from test run to test run.)
exit_code, output, errput = svntest.main.run_svnadmin("lslocks",
sbox.repo_dir,
"iota")
@@ -1755,8 +1757,8 @@ def locking(sbox):
if iota_token is None:
raise svntest.Failure("Unable to lookup lock token for 'iota'")
- # Try to unlock a path with the correct token but with a
- # preventative hook in place.
+ # Try to unlock a path while providing the correct lock token but
+ # with a preventative hook in place.
expected_error = ".*svnadmin: E165001:.*"
svntest.actions.run_and_verify_svnadmin(None, None,
expected_error, "unlock",
@@ -1764,7 +1766,8 @@ def locking(sbox):
"iota", "jrandom",
iota_token)
- # Finally, unlock the path with --bypass-hooks.
+ # Finally, use --bypass-hooks to unlock the path (again using the
+ # correct lock token).
expected_output = "'iota' unlocked."
svntest.actions.run_and_verify_svnadmin(None, expected_output,
None, "unlock",