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 2013/12/18 22:27:59 UTC
svn commit: r1552108 -
/subversion/trunk/subversion/tests/cmdline/lock_tests.py
Author: rhuijben
Date: Wed Dec 18 21:27:58 2013
New Revision: 1552108
URL: http://svn.apache.org/r1552108
Log:
Make a regression test a bit stricter and remove some bad whitespace.
* subversion/tests/cmdline/lock_tests.py
(lock_path_not_in_head): Remove a workaround for the old serf error message.
(drop_locks_on_parent_deletion,
copy_with_lock): Remove tabs.
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=1552108&r1=1552107&r2=1552108&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Wed Dec 18 21:27:58 2013
@@ -1460,8 +1460,7 @@ def lock_path_not_in_head(sbox):
'-m', 'Some deletions', wc_dir)
svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r1', wc_dir)
expected_lock_fail_err_re = "svn: warning: W160042: " \
- "((Path .* doesn't exist in HEAD revision)" \
- "|(L(ock|OCK) request (on '.*' )?failed: 405 Method Not Allowed))"
+ "(Path .* doesn't exist in HEAD revision)"
# Issue #3524 These lock attemtps were triggering an assert over ra_serf:
#
# working_copies\lock_tests-37>svn lock A\D
@@ -1876,11 +1875,11 @@ def drop_locks_on_parent_deletion(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B',
- 'A/B/E',
- 'A/B/E/alpha',
- 'A/B/F',
- 'A/B/lambda',
- wc_rev='3')
+ 'A/B/E',
+ 'A/B/E/alpha',
+ 'A/B/F',
+ 'A/B/lambda',
+ wc_rev='3')
expected_status.remove('A/B/E/beta')
svntest.actions.run_and_verify_commit(wc_dir,
@@ -1888,7 +1887,7 @@ def drop_locks_on_parent_deletion(sbox):
expected_status,
None,
wc_dir)
-
+
def copy_with_lock(sbox):
"""copy with lock on source"""
@@ -1919,7 +1918,7 @@ def copy_with_lock(sbox):
expected_status,
None,
wc_dir)
-
+
########################################################################
# Run the tests