svn commit: r1584745 - /subversion/trunk/subversion/tests/cmdline/lock_tests.py

[rh...@apache.org]

Author: rhuijben
Date: Fri Apr  4 15:28:37 2014
New Revision: 1584745

URL: http://svn.apache.org/r1584745
Log:
* subversion/tests/cmdline/lock_tests.py
  (dav_lock_refresh): Use svn to obtain the lock, to make the test more
    compatible with maintainance branches.

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=1584745&r1=1584744&r2=1584745&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Fri Apr  4 15:28:37 2014
@@ -2242,7 +2242,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)
@@ -2255,7 +2256,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'
   }