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 2014/04/04 17:30:19 UTC
svn commit: r1584746 - in /subversion/branches/1.8.x-r1584592: ./
subversion/tests/cmdline/lock_tests.py
Author: rhuijben
Date: Fri Apr 4 15:30:18 2014
New Revision: 1584746
URL: http://svn.apache.org/r1584746
Log:
Merge r1584745 from trunk
Modified:
subversion/branches/1.8.x-r1584592/ (props changed)
subversion/branches/1.8.x-r1584592/subversion/tests/cmdline/lock_tests.py
Propchange: subversion/branches/1.8.x-r1584592/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1584745
Modified: subversion/branches/1.8.x-r1584592/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1584592/subversion/tests/cmdline/lock_tests.py?rev=1584746&r1=1584745&r2=1584746&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1584592/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/branches/1.8.x-r1584592/subversion/tests/cmdline/lock_tests.py Fri Apr 4 15:30:18 2014
@@ -1902,7 +1902,8 @@ def dav_lock_refresh(sbox):
sbox.build(create_wc = False)
# Acquire lock on 'iota'
- svntest.main.run_lock_helper(sbox.repo_dir, 'iota', 'jconstant', 3600)
+ svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+ sbox.repo_url + '/iota')
# Try to refresh lock using 'If' header
loc = urlparse(sbox.repo_url)
@@ -1915,7 +1916,7 @@ def dav_lock_refresh(sbox):
lock_token = svntest.actions.run_and_parse_info(sbox.repo_url + '/iota')[0]['Lock Token']
lock_headers = {
- 'Authorization': 'Basic ' + base64.b64encode('jconstant:rayjandom'),
+ 'Authorization': 'Basic ' + base64.b64encode('jrandom:rayjandom'),
'If': '(<' + lock_token + '>)',
'Timeout': 'Second-7200'
}