subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1658410 [8/16] - in /subversion/trunk/subversion/tests/cmdline: ./ svntest/
Date Mon, 09 Feb 2015 14:27:51 GMT
Modified: subversion/trunk/subversion/tests/cmdline/lock_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/lock_tests.py?rev=1658410&r1=1658409&r2=1658410&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/lock_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/lock_tests.py Mon Feb  9 14:27:49 2015
@@ -87,7 +87,7 @@ def lock_file(sbox):
   svntest.main.file_append(file_path, "This represents a binary file\n")
   svntest.main.run_svn(None, 'commit',
                        '-m', '', file_path)
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', file_path)
 
   # --- Meanwhile, in our other working copy... ---
@@ -135,7 +135,7 @@ def commit_file_keep_lock(sbox):
   wc_dir = sbox.wc_dir
 
   # lock 'A/mu' as wc_author
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', 'some lock comment',
                                      sbox.ospath('A/mu'))
 
@@ -158,7 +158,7 @@ def commit_file_unlock(sbox):
   wc_dir = sbox.wc_dir
 
   # lock A/mu and iota as wc_author
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', 'some lock comment',
                                      sbox.ospath('A/mu'),
                                      sbox.ospath('iota'))
@@ -188,7 +188,7 @@ def commit_propchange(sbox):
   wc_dir = sbox.wc_dir
 
   # lock A/mu as wc_author
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', 'some lock comment',
                                      sbox.ospath('A/mu'))
 
@@ -226,7 +226,7 @@ def break_lock(sbox):
   file_path = sbox.ospath('iota')
   file_path_b = sbox.ospath('iota', wc_dir=wc_b)
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', file_path)
 
   # --- Meanwhile, in our other working copy... ---
@@ -236,11 +236,11 @@ def break_lock(sbox):
   # attempt (and fail) to unlock file
 
   # This should give a "iota' is not locked in this working copy" error
-  svntest.actions.run_and_verify_svn(None, None, ".*not locked",
+  svntest.actions.run_and_verify_svn(None, ".*not locked",
                                      'unlock',
                                      file_path_b)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [],
+  svntest.actions.run_and_verify_svn(".*unlocked", [],
                                      'unlock', '--force',
                                      file_path_b)
 
@@ -268,7 +268,7 @@ def steal_lock(sbox):
   file_path = sbox.ospath('iota')
   file_path_b = sbox.ospath('iota', wc_dir=wc_b)
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', file_path)
 
   # --- Meanwhile, in our other working copy... ---
@@ -278,12 +278,12 @@ def steal_lock(sbox):
   # attempt (and fail) to lock file
 
   # This should give a "iota' is already locked... error, but exits 0.
-  svntest.actions.run_and_verify_svn2(None, None,
+  svntest.actions.run_and_verify_svn2(None,
                                       ".*already locked", 0,
                                       'lock',
                                       '-m', 'trying to break', file_path_b)
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
+  svntest.actions.run_and_verify_svn(".*locked by user", [],
                                      'lock', '--force',
                                      '-m', 'trying to break', file_path_b)
 
@@ -313,7 +313,7 @@ def handle_defunct_lock(sbox):
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
 
   # lock the file
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', sbox.ospath('iota'))
 
   # Make a second copy of the working copy
@@ -324,7 +324,7 @@ def handle_defunct_lock(sbox):
   # --- Meanwhile, in our other working copy... ---
 
   # Try unlocking the file in the second wc.
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      file_path_b)
 
 
@@ -376,7 +376,7 @@ def enforce_lock(sbox):
       raise svntest.Failure
 
     # obtain a lock on one of these files...
-    svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+    svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                        '-m', '', iota_path)
 
     # ...and verify that the write bit gets set...
@@ -385,7 +385,7 @@ def enforce_lock(sbox):
       raise svntest.Failure
 
     # ...and unlock it...
-    svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+    svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                        iota_path)
 
     # ...and verify that the write bit gets unset
@@ -414,7 +414,7 @@ def update_while_needing_lock(sbox):
   sbox.simple_update()
 
   # Lock, modify, commit, unlock, to create r3.
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', sbox.ospath('iota'))
   sbox.simple_append('iota', 'This line added in r2.\n')
   sbox.simple_commit('iota') # auto-unlocks
@@ -453,12 +453,12 @@ def defunct_lock(sbox):
   svntest.main.run_svn(None, 'update', wc_b)
 
   # lock iota in wc_b
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', iota_path_b)
 
 
   # break the lock iota in wc a
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock', '--force',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock', '--force',
                                      '-m', '', iota_path)
   # update wc_b
   svntest.main.run_svn(None, 'update', wc_b)
@@ -482,16 +482,16 @@ def deleted_path_lock(sbox):
   iota_path = sbox.ospath('iota')
   iota_url = sbox.repo_url + '/iota'
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', iota_path)
 
   sbox.simple_rm('iota')
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '--no-unlock',
                                      '-m', '', iota_path)
 
   # Now make sure that we can delete the lock from iota via a URL
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      iota_url)
 
 
@@ -511,14 +511,14 @@ def lock_unlock(sbox):
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', writelocked='K')
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', pi_path, rho_path, tau_path)
 
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   expected_status.tweak('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', writelocked=None)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      pi_path, rho_path, tau_path)
 
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -535,11 +535,11 @@ def deleted_dir_lock(sbox):
   rho_path = sbox.ospath('A/D/G/rho')
   tau_path = sbox.ospath('A/D/G/tau')
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', pi_path, rho_path, tau_path)
 
   sbox.simple_rm('A/D/G')  # the parent directory
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '--no-unlock',
                                      '-m', '', sbox.ospath('A/D/G'))
 
@@ -705,7 +705,7 @@ def out_of_date(sbox):
                        '-m', '', file_path)
 
   # --- Meanwhile, in our other working copy... ---
-  svntest.actions.run_and_verify_svn2(None, None,
+  svntest.actions.run_and_verify_svn2(None,
                                       ".*newer version of '/iota' exists", 0,
                                       'lock',
                                       '--username', svntest.main.wc_author2,
@@ -724,11 +724,11 @@ def revert_lock(sbox):
   mode = stat.S_IWGRP | stat.S_IWOTH | stat.S_IWRITE
 
   # set the prop in wc
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                   'svn:needs-lock', 'foo', iota_path)
 
   # commit r2
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                        '-m', '', iota_path)
 
   # make sure that iota got set to read-only
@@ -743,7 +743,7 @@ def revert_lock(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # remove read-only-ness
-  svntest.actions.run_and_verify_svn(None, None, [], 'propdel',
+  svntest.actions.run_and_verify_svn(None, [], 'propdel',
                                   'svn:needs-lock', iota_path)
 
   # make sure that iota got read-only-ness removed
@@ -753,7 +753,7 @@ def revert_lock(sbox):
     raise svntest.Failure
 
   # revert the change
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', iota_path)
+  svntest.actions.run_and_verify_svn(None, [], 'revert', iota_path)
 
   # make sure that iota got set back to read-only
   if (os.stat(iota_path)[0] & mode):
@@ -766,7 +766,7 @@ def revert_lock(sbox):
   extra_name = 'xx'
 
   # now lock the file
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                        '-m', '', iota_path)
 
   # modify it
@@ -778,7 +778,7 @@ def revert_lock(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # revert it
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', iota_path)
+  svntest.actions.run_and_verify_svn(None, [], 'revert', iota_path)
 
   # make sure it is still writable since we have the lock
   if (os.stat(iota_path)[0] & mode == 0):
@@ -815,7 +815,7 @@ def lock_several_files(sbox):
   lambda_path = os.path.join(sbox.wc_dir, 'A', 'B', 'lambda')
   alpha_path = os.path.join(sbox.wc_dir, 'A', 'B', 'E', 'alpha')
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '--username', svntest.main.wc_author2,
                                      '-m', 'lock several',
                                      iota_path, lambda_path, alpha_path)
@@ -824,7 +824,7 @@ def lock_several_files(sbox):
   expected_status.tweak('iota', 'A/B/lambda', 'A/B/E/alpha', writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      '--username', svntest.main.wc_author2,
                                      iota_path, lambda_path, alpha_path)
 
@@ -843,10 +843,10 @@ def lock_switched_files(sbox):
   iota_URL = sbox.repo_url + '/iota'
   alpha_URL = sbox.repo_url + '/A/B/E/alpha'
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+  svntest.actions.run_and_verify_svn(None, [], 'switch',
                                      iota_URL, gamma_path,
                                      '--ignore-ancestry')
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+  svntest.actions.run_and_verify_svn(None, [], 'switch',
                                      alpha_URL, lambda_path,
                                      '--ignore-ancestry')
 
@@ -854,7 +854,7 @@ def lock_switched_files(sbox):
   expected_status.tweak('A/D/gamma', 'A/B/lambda', switched='S')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', 'lock several',
                                      gamma_path, lambda_path)
 
@@ -865,7 +865,7 @@ def lock_switched_files(sbox):
 
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      gamma_path, lambda_path)
 
   expected_status.tweak('A/D/gamma', 'A/B/lambda', writelocked=None)
@@ -883,7 +883,7 @@ def lock_uri_encoded(sbox):
   file_path = sbox.ospath(fname)
 
   svntest.main.file_append(file_path, "This represents a binary file\n")
-  svntest.actions.run_and_verify_svn(None, None, [], "add", file_path)
+  svntest.actions.run_and_verify_svn(None, [], "add", file_path)
 
   expected_output = svntest.wc.State(wc_dir, {
     fname : Item(verb='Adding'),
@@ -899,14 +899,14 @@ def lock_uri_encoded(sbox):
                                         None,
                                         file_path)
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', file_path)
 
   # Make sure that the file was locked.
   expected_status.tweak(fname, writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      file_path)
 
   # Make sure it was successfully unlocked again.
@@ -915,14 +915,14 @@ def lock_uri_encoded(sbox):
 
   # And now the URL case.
   file_url = sbox.repo_url + '/' + fname
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', file_url)
 
   # Make sure that the file was locked.
   expected_status.tweak(fname, writelocked='O')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      file_url)
 
   # Make sure it was successfully unlocked again.
@@ -947,15 +947,15 @@ def lock_and_exebit1(sbox):
   gamma_path = sbox.ospath('A/D/gamma')
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:needs-lock property,.*"
-  svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
                                       'ps', 'svn:needs-lock', ' ', gamma_path)
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:executable property,.*"
-  svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
                                       'ps', 'svn:executable', ' ', gamma_path)
 
   # commit
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '-m', '', gamma_path)
   # mode should be +r, -w, +x
   gamma_stat = os.stat(gamma_path)[0]
@@ -967,7 +967,7 @@ def lock_and_exebit1(sbox):
     raise svntest.Failure
 
   # lock
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', gamma_path)
   # mode should be +r, +w, +x
   gamma_stat = os.stat(gamma_path)[0]
@@ -982,7 +982,7 @@ def lock_and_exebit1(sbox):
   svntest.main.file_append(gamma_path, "check stat output after mod & unlock")
 
   # unlock
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      gamma_path)
 
   # Mode should be +r, -w, +x
@@ -995,7 +995,7 @@ def lock_and_exebit1(sbox):
     raise svntest.Failure
 
   # ci
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '-m', '', gamma_path)
 
   # Mode should be still +r, -w, +x
@@ -1024,15 +1024,15 @@ def lock_and_exebit2(sbox):
   gamma_path = sbox.ospath('A/D/gamma')
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:needs-lock property,.*"
-  svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
                                       'ps', 'svn:needs-lock', ' ', gamma_path)
 
   expected_err = ".*svn: warning: W125005: To turn off the svn:executable property,.*"
-  svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
                                      'ps', 'svn:executable', ' ', gamma_path)
 
   # commit
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '-m', '', gamma_path)
   # mode should be +r, -w, +x
   gamma_stat = os.stat(gamma_path)[0]
@@ -1044,7 +1044,7 @@ def lock_and_exebit2(sbox):
     raise svntest.Failure
 
   # lock
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', gamma_path)
   # mode should be +r, +w, +x
   gamma_stat = os.stat(gamma_path)[0]
@@ -1059,7 +1059,7 @@ def lock_and_exebit2(sbox):
   svntest.main.file_append(gamma_path, "check stat output after mod & unlock")
 
   # commit
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '-m', '', gamma_path)
 
   # Mode should be +r, -w, +x
@@ -1085,7 +1085,7 @@ def commit_xml_unsafe_file_unlock(sbox):
                        'commit', '-m', '', file_path)
 
   # lock fname as wc_author
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', 'some lock comment', file_path)
 
   # make a change and commit it, allowing lock to be released
@@ -1112,7 +1112,7 @@ def repos_lock_with_info(sbox):
   file_url = sbox.repo_url + '/' + fname
 
   # lock wc file
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '--username', svntest.main.wc_author2,
                                      '-m', comment, file_path)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -1120,7 +1120,7 @@ def repos_lock_with_info(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Steal lock on wc file
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '--username', svntest.main.wc_author2,
                                      '--force',
                                      '-m', comment, file_url)
@@ -1155,7 +1155,7 @@ def unlock_already_unlocked_files(sbox):
   alpha_path = sbox.ospath('A/B/E/alpha')
   gamma_path = sbox.ospath('A/D/gamma')
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '--username', svntest.main.wc_author2,
                                      '-m', 'lock several',
                                      iota_path, lambda_path, alpha_path)
@@ -1166,14 +1166,14 @@ def unlock_already_unlocked_files(sbox):
 
   error_msg = ".*Path '/A/B/E/alpha' is already locked by user '" + \
               svntest.main.wc_author2 + "'.*"
-  svntest.actions.run_and_verify_svn2(None, None, error_msg, 0,
+  svntest.actions.run_and_verify_svn2(None, error_msg, 0,
                                       'lock',
                                       '--username', svntest.main.wc_author2,
                                       alpha_path, gamma_path)
   expected_status.tweak('A/D/gamma', writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [], 'unlock',
+  svntest.actions.run_and_verify_svn(".*unlocked", [], 'unlock',
                                      '--username', svntest.main.wc_author2,
                                      lambda_path)
 
@@ -1182,7 +1182,7 @@ def unlock_already_unlocked_files(sbox):
 
   error_msg = "(.*No lock on path '/A/B/lambda'.*)" + \
               "|(.*'A/B/lambda' is not locked.*)"
-  svntest.actions.run_and_verify_svn2(None, None, error_msg, 0,
+  svntest.actions.run_and_verify_svn2(None, error_msg, 0,
                                       'unlock',
                                       '--username', svntest.main.wc_author2,
                                       '--force',
@@ -1202,7 +1202,7 @@ def info_moved_path(sbox):
   fname2 = sbox.ospath("iota2")
 
   # Move iota, creating r2.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "mv", fname, fname2)
   expected_output = svntest.wc.State(wc_dir, {
     'iota2' : Item(verb='Adding'),
@@ -1221,7 +1221,7 @@ def info_moved_path(sbox):
 
   # Create a new, unrelated iota, creating r3.
   svntest.main.file_append(fname, "Another iota")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "add", fname)
   expected_output = svntest.wc.State(wc_dir, {
     'iota' : Item(verb='Adding'),
@@ -1236,7 +1236,7 @@ def info_moved_path(sbox):
                                         wc_dir)
 
   # Lock the new iota.
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
+  svntest.actions.run_and_verify_svn(".*locked by user", [],
                                      "lock", fname)
   expected_status.tweak("iota", writelocked="K")
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1258,10 +1258,10 @@ def ls_url_encoded(sbox):
   fname = os.path.join(dirname, "f")
 
   # Create a dir with a space in its name and a file therein.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "mkdir", dirname)
   svntest.main.file_append(fname, "someone was here")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "add", fname)
   expected_output = svntest.wc.State(wc_dir, {
     'space dir' : Item(verb='Adding'),
@@ -1279,14 +1279,13 @@ def ls_url_encoded(sbox):
                                         wc_dir)
 
   # Lock the file.
-  svntest.actions.run_and_verify_svn("Lock space dir/f", ".*locked by user",
+  svntest.actions.run_and_verify_svn(".*locked by user",
                                      [], "lock", fname)
 
   # Make sure ls shows it being locked.
   expected_output = " +2 " + re.escape(svntest.main.wc_author) + " +O .+f|" \
                     " +2 " + re.escape(svntest.main.wc_author) + "    .+\./"
-  svntest.actions.run_and_verify_svn("List space dir",
-                                     expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      "list", "-v", dirname)
 
 #----------------------------------------------------------------------
@@ -1303,19 +1302,19 @@ def unlock_wrong_token(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
   file_url = sbox.repo_url + "/iota"
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      file_path)
 
   # Steal the lock as the same author, but using a URL to keep the old token
   # in the WC.
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                     "--force", file_url)
 
   # Then, unlocking the WC path should fail.
   ### The error message returned is actually this, but let's worry about that
   ### another day...
   svntest.actions.run_and_verify_svn2(
-    None, None, ".*(No lock on path)", 0,
+    None, ".*(No lock on path)", 0,
     'unlock', file_path)
 
 #----------------------------------------------------------------------
@@ -1331,7 +1330,7 @@ def examine_lock_encoded_recurse(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
 
   svntest.main.file_append(file_path, "This represents a binary file\n")
-  svntest.actions.run_and_verify_svn(None, None, [], "add", file_path)
+  svntest.actions.run_and_verify_svn(None, [], "add", file_path)
 
   expected_output = svntest.wc.State(wc_dir, {
     fname : Item(verb='Adding'),
@@ -1364,7 +1363,7 @@ def unlocked_lock_of_other_user(sbox):
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/D/G/pi', writelocked='K')
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', pi_path)
 
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1375,7 +1374,7 @@ def unlocked_lock_of_other_user(sbox):
   else:
     expected_err = "svn: warning: W160039: User '%s' is trying to use a lock owned by "\
                    "'%s'.*" % (svntest.main.wc_author2, svntest.main.wc_author)
-  svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
+  svntest.actions.run_and_verify_svn2([], expected_err, 0,
                                       'unlock',
                                       '--username', svntest.main.wc_author2,
                                       pi_path)
@@ -1396,7 +1395,7 @@ def lock_funky_comment_chars(sbox):
   svntest.main.file_append(file_path, "This represents a binary file\n")
   svntest.main.run_svn(None, 'commit',
                        '-m', '', file_path)
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', 'lock & load', file_path)
 
 #----------------------------------------------------------------------
@@ -1413,25 +1412,25 @@ def lock_twice_in_one_wc(sbox):
 
   # Create a needs-lock file
   svntest.actions.set_prop('svn:needs-lock', '*', mu_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', wc_dir, '-m', '')
 
   # Mark the file readonly
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'update', wc_dir)
 
   # Switch a second location for the same file in the same working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'switch', sbox.repo_url + '/A',
                                      sbox.ospath('A/B'),
                                      '--ignore-ancestry')
 
   # Lock location 1
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'lock', mu_path, '-m', 'Locked here')
 
   # Locking in location 2 should fail ### Currently returns exitcode 0
-  svntest.actions.run_and_verify_svn2(None, None, ".*is already locked.*", 0,
+  svntest.actions.run_and_verify_svn2(None, ".*is already locked.*", 0,
                                       'lock', '-m', '', mu2_path)
 
   # Change the file anyway
@@ -1441,7 +1440,7 @@ def lock_twice_in_one_wc(sbox):
   # Commit will just succeed as the DB owns the lock. It's a user decision
   # to commit the other target instead of the one originally locked
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', mu2_path, '-m', '')
 
 #----------------------------------------------------------------------
@@ -1460,11 +1459,11 @@ def lock_path_not_in_head(sbox):
   # Commit deletion of A/D and A/B/lambda as r2, then update the WC
   # back to r1.  Then attempt to lock some paths that no longer exist
   # in HEAD.  These should fail gracefully.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'delete', lambda_path, D_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '-m', 'Some deletions', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r1', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', '-r1', wc_dir)
   expected_lock_fail_err_re = "svn: warning: W160042: " \
   "(Path .* doesn't exist in HEAD revision)"
   # Issue #3524 These lock attemtps were triggering an assert over ra_serf:
@@ -1478,11 +1477,11 @@ def lock_path_not_in_head(sbox):
   # ..\..\..\subversion\libsvn_client\ra.c:275: (apr_err=235000)
   # svn: In file '..\..\..\subversion\libsvn_ra_serf\util.c' line 1120:
   #  assertion failed (ctx->status_code)
-  svntest.actions.run_and_verify_svn2(None, None, expected_lock_fail_err_re,
+  svntest.actions.run_and_verify_svn2(None, expected_lock_fail_err_re,
                                       0, 'lock', lambda_path)
 
   expected_err = 'svn: E155008: The node \'.*D\' is not a file'
-  svntest.actions.run_and_verify_svn(None, None, expected_err,
+  svntest.actions.run_and_verify_svn(None, expected_err,
                                      'lock', D_path)
 
 
@@ -1538,37 +1537,37 @@ def replace_and_propset_locked_path(sbox
   rho_path = sbox.ospath('A/D/G/rho')
 
   # Lock mu and A/D/G/rho.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'lock', mu_path, rho_path,
                                      '-m', 'Locked')
 
   # Now replace and propset on mu.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', '--keep-local', mu_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'add', mu_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'bar', mu_path)
 
   # Commit mu.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', '', mu_path)
 
   # Let's try this again where directories are involved, shall we?
   # Replace A/D/G and A/D/G/rho, propset on A/D/G/rho.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', G_path)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', G_path)
   svntest.main.file_append(rho_path, "This is the new file 'rho'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'add', rho_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'bar', rho_path)
 
   # And commit G.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', '', G_path)
 
 
@@ -1681,14 +1680,14 @@ def block_unlock_if_pre_unlock_hook_fail
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/D/G/pi', writelocked='K')
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', pi_path)
 
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Make sure the unlock operation fails as pre-unlock hook blocks it.
   expected_unlock_fail_err_re = ".*error text"
-  svntest.actions.run_and_verify_svn2(None, None, expected_unlock_fail_err_re,
+  svntest.actions.run_and_verify_svn2(None, expected_unlock_fail_err_re,
                                       0, 'unlock', pi_path)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
@@ -1708,7 +1707,7 @@ def lock_invalid_token(sbox):
   fname = 'iota'
   file_path = os.path.join(sbox.wc_dir, fname)
 
-  svntest.actions.run_and_verify_svn2(None, None,
+  svntest.actions.run_and_verify_svn2(None,
                                       "svn: warning: W160037: " \
                                       ".*scheme.*'opaquelocktoken'", 0,
                                       'lock', '-m', '', file_path)
@@ -1729,7 +1728,7 @@ def lock_multi_wc(sbox):
     '\'%s\' locked by user \'jrandom\'.\n' % sbox2.ospath('A/mu'),
   ])
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'lock', sbox.ospath('iota'),
                                              sbox2.ospath('A/mu'))
 
@@ -1737,7 +1736,7 @@ def lock_multi_wc(sbox):
     '\'%s\' unlocked.\n' % sbox.ospath('iota'),
     '\'%s\' unlocked.\n' % sbox2.ospath('A/mu'),
   ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'unlock', sbox.ospath('iota'),
                                                sbox2.ospath('A/mu'))
 
@@ -1749,7 +1748,7 @@ def locks_stick_over_switch(sbox):
   wc_dir = sbox.wc_dir
   repo_url = sbox.repo_url
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', sbox.ospath('A'), repo_url + '/AA',
                                      '-m', '')
 
@@ -1758,7 +1757,7 @@ def locks_stick_over_switch(sbox):
     '\'%s\' locked by user \'jrandom\'.\n' % os.path.join('A', 'D', 'H', 'chi'),
     '\'%s\' locked by user \'jrandom\'.\n' % os.path.join('A', 'mu'),
   ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'lock', sbox.ospath('A/D/H/chi'),
                                              sbox.ospath('A/mu'),
                                              sbox.ospath('iota'))
@@ -1798,7 +1797,7 @@ def lock_unlock_deleted(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', sbox.ospath('A/mu'))
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -1806,13 +1805,13 @@ def lock_unlock_deleted(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   expected_output = '\'mu\' locked by user \'jrandom\'.'
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'lock', sbox.ospath('A/mu'))
   expected_status.tweak('A/mu', writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   expected_output = '\'mu\' unlocked.'
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'unlock', sbox.ospath('A/mu'))
   expected_status.tweak('A/mu', writelocked=None)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1828,7 +1827,7 @@ def commit_stolen_lock(sbox):
   sbox.simple_lock('A/mu')
 
   expected_output = '\'.*mu\' locked by user \'jrandom\'.'
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'lock', '--force',
                                      sbox.repo_url + '/A/mu')
 
@@ -1931,7 +1930,7 @@ def lock_hook_messages(sbox):
   iota_url = sbox.repo_url + "/iota"
   mu_url = sbox.repo_url + "/A/mu"
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      iota_url)
 
   error_msg = "Text with <angle brackets> & ampersand"
@@ -1939,7 +1938,7 @@ def lock_hook_messages(sbox):
   svntest.actions.create_failing_hook(repo_dir, "pre-unlock", error_msg)
 
   _, _, actual_stderr = svntest.actions.run_and_verify_svn2(
-                                     None, [], svntest.verify.AnyOutput, 0,
+                                     [], svntest.verify.AnyOutput, 0,
                                      'lock', mu_url)
   if len(actual_stderr) > 2:
     actual_stderr = actual_stderr[-2:]
@@ -1952,7 +1951,7 @@ def lock_hook_messages(sbox):
 
 
   _, _, actual_stderr = svntest.actions.run_and_verify_svn2(
-                                     None, [], svntest.verify.AnyOutput, 0,
+                                     [], svntest.verify.AnyOutput, 0,
                                      'unlock', iota_url)
   if len(actual_stderr) > 2:
     actual_stderr = actual_stderr[-2:]
@@ -1985,7 +1984,7 @@ def failing_post_hooks(sbox):
     expected_unlock_err = expected_lock_err = ".*error text"
 
   # Failing post-lock doesn't stop lock being created.
-  svntest.actions.run_and_verify_svn(None, "'pi' locked by user",
+  svntest.actions.run_and_verify_svn("'pi' locked by user",
                                      expected_lock_err,
                                      'lock', '-m', '', pi_path)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1993,7 +1992,7 @@ def failing_post_hooks(sbox):
   expected_status.tweak('A/D/G/pi', writelocked=None)
 
   # Failing post-unlock doesn't stop lock being removed.
-  svntest.actions.run_and_verify_svn(None, "'pi' unlocked",
+  svntest.actions.run_and_verify_svn("'pi' unlocked",
                                      expected_unlock_err,
                                      'unlock', pi_path)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -2005,7 +2004,7 @@ def break_delete_add(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
+  svntest.actions.run_and_verify_svn(".*locked by user", [],
                                      'lock',
                                      '-m', 'some lock comment',
                                      sbox.ospath('A/mu'))
@@ -2014,11 +2013,11 @@ def break_delete_add(sbox):
   expected_status.tweak('A/mu', writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, ".*unlocked", [],
+  svntest.actions.run_and_verify_svn(".*unlocked", [],
                                      'unlock', '--force',
                                      sbox.repo_url + '/A/mu')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm',
                                      '-m', 'delete file',
                                      sbox.repo_url + '/A/mu')
@@ -2053,7 +2052,7 @@ def dav_lock_timeout(sbox):
   expiration_date = svntest.actions.run_and_parse_info(sbox.repo_url + '/iota')[0]['Lock Expires']
 
   # Verify that there is a lock, by trying to obtain one
-  svntest.actions.run_and_verify_svn2(None, None, ".*locked by user", 0,
+  svntest.actions.run_and_verify_svn2(None, ".*locked by user", 0,
                                       'lock', '-m', '', sbox.ospath('iota'))
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('iota', writelocked='O')
@@ -2061,11 +2060,11 @@ def dav_lock_timeout(sbox):
 
   # This used to fail over serf with a parse error of the timeout.
   expected_err = "svn: warning: W160039:"
-  svntest.actions.run_and_verify_svn2(None, None, expected_err, 0,
+  svntest.actions.run_and_verify_svn2(None, expected_err, 0,
                                      'unlock', sbox.repo_url + '/iota')
 
   # Force unlock via working copy, this also used to fail over serf.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'unlock', sbox.ospath('iota'), '--force')
   expected_status.tweak('iota', writelocked=None)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -2076,7 +2075,7 @@ def dav_lock_timeout(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Force unlock via URL, this also used to fail over serf
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'unlock', sbox.repo_url + '/iota',
                                      '--force')
   expected_status.tweak('iota', writelocked=None)
@@ -2088,7 +2087,7 @@ def dav_lock_timeout(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Force lock via working copy, this also used to fail over serf.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'lock', sbox.ospath('iota'), '--force')
   expected_status.tweak('iota', writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -2144,7 +2143,7 @@ def non_root_locks(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', sbox.repo_url, sbox.repo_url + '/X',
                                      '-m', 'copy greek tree')
 
@@ -2153,7 +2152,7 @@ def non_root_locks(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Lock a file
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
+  svntest.actions.run_and_verify_svn(".*locked by user", [],
                                      'lock', sbox.ospath('A/D/G/pi'),
                                      '-m', '')
   expected_status.tweak('A/D/G/pi', writelocked='K')
@@ -2166,7 +2165,7 @@ def non_root_locks(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Break the lock
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'unlock', sbox.repo_url + '/X/A/D/G/pi')
 
   # Subdir update reports the break
@@ -2175,12 +2174,12 @@ def non_root_locks(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Relock and break
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
+  svntest.actions.run_and_verify_svn(".*locked by user", [],
                                      'lock', sbox.ospath('A/D/G/pi'),
                                      '-m', '')
   expected_status.tweak('A/D/G/pi', writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'unlock', sbox.repo_url + '/X/A/D/G/pi')
 
   # Root update reports the break
@@ -2210,8 +2209,7 @@ def many_locks_hooks(sbox):
                                          '  sys.exit(1)\n'
                                          'sys.exit(0)\n')
 
-  svntest.actions.run_and_verify_svn2(None,
-                                      ".* locked",
+  svntest.actions.run_and_verify_svn2(".* locked",
                                       "svn: warning: W165001: .*", 0,
                                       'lock',
                                       sbox.ospath('iota'),
@@ -2225,8 +2223,7 @@ def many_locks_hooks(sbox):
                         writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn2(None,
-                                      ".* unlocked",
+  svntest.actions.run_and_verify_svn2(".* unlocked",
                                       "svn: warning: W165001: .*", 0,
                                       'unlock',
                                       sbox.ospath('iota'),
@@ -2252,7 +2249,7 @@ def dav_lock_refresh(sbox):
   sbox.build(create_wc = False)
 
   # Acquire lock on 'iota'
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      sbox.repo_url + '/iota')
 
   # Try to refresh lock using 'If' header
@@ -2325,10 +2322,10 @@ def lock_commit_bump(sbox):
   changed_file = sbox.ospath('changed')
   sbox.simple_append('changed', 'Changed!')
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'unlock', '--force',
+  svntest.actions.run_and_verify_svn(None, [], 'unlock', '--force',
                                      sbox.repo_url + '/iota')
 
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                                          '-U', sbox.repo_url, '-m', 'Q',
                                          'put', changed_file, 'iota')
 
@@ -2366,12 +2363,12 @@ def copy_dir_with_locked_file(sbox):
 
   svntest.main.run_svn(None, 'lock', '-m', 'locked', mu_url)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', A_url, AA_url,
                                      '-m', '')
 
   expected_err = "svn: E160037: .*no matching lock-token available"
-  svntest.actions.run_and_verify_svn(None, None, expected_err,
+  svntest.actions.run_and_verify_svn(None, expected_err,
                                      'mv', A_url, AA2_url,
                                      '-m', '')
 

Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1658410&r1=1658409&r2=1658410&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Mon Feb  9 14:27:49 2015
@@ -734,7 +734,7 @@ def plain_log(sbox):
 
   os.chdir(sbox.wc_dir)
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log')
 
   log_chain = parse_log_output(output)
@@ -748,7 +748,7 @@ def log_with_empty_repos(sbox):
   # Create virgin repos
   sbox.build(create_wc=False, empty=True)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'log',
                                      sbox.repo_url)
 
@@ -768,13 +768,13 @@ def log_where_nothing_changed(sbox):
 
   rho_path = os.path.join(sbox.wc_dir, 'A', 'D', 'G', 'rho')
   svntest.main.file_append(rho_path, "some new material in rho")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m',
                                      'log msg', rho_path)
 
   # Now run 'svn log -r2' on a directory unaffected by revision 2.
   H_path = os.path.join(sbox.wc_dir, 'A', 'D', 'H')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'log', '-r', '2', H_path)
 
 
@@ -785,7 +785,7 @@ def log_to_revision_zero(sbox):
 
   # This used to segfault the server.
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'log', '-v',
                                      '-r', '1:0', sbox.wc_dir)
 
@@ -798,7 +798,7 @@ def log_with_path_args(sbox):
   os.chdir(sbox.wc_dir)
 
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [],
+    None, [],
     'log', sbox.repo_url, 'A/D/G', 'A/D/H')
 
   log_chain = parse_log_output(output)
@@ -827,7 +827,7 @@ def log_wc_with_peg_revision(sbox):
   "'svn log wc_target@N'"
   guarantee_repos_and_wc(sbox)
   my_path = os.path.join(sbox.wc_dir, "A", "B", "E", "beta") + "@8"
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', my_path)
   check_log_chain(parse_log_output(output), [1])
 
@@ -839,7 +839,7 @@ def url_missing_in_head(sbox):
 
   my_url = sbox.repo_url + "/A/B/E/alpha" + "@8"
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', my_url)
   check_log_chain(parse_log_output(output), [3, 1])
 
@@ -870,38 +870,38 @@ def log_through_copyfrom_history(sbox):
 
   svntest.main.file_write(msg_file, msg2)
   svntest.main.file_append(mu_path, "2")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir,
                                      '-F', msg_file)
   svntest.main.file_append(mu2_path, "this is mu2")
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', mu2_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [], 'add', mu2_path)
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir,
                                      '-m', "Log message for revision 3")
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', mu2_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', mu2_path)
   svntest.main.file_write(msg_file, msg4)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir,
                                      '-F', msg_file)
   svntest.main.file_append(mu_path, "5")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir,
                                      '-m', "Log message for revision 5")
 
   svntest.main.file_write(msg_file, msg6)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', '-r', '5', mu_URL, mu2_URL,
                                      '-F', msg_file)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', wc_dir)
 
   # The full log for mu2 is relatively unsurprising
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', mu2_path)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [6, 5, 2, 1])
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', mu2_URL)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [6, 5, 2, 1])
@@ -909,25 +909,25 @@ def log_through_copyfrom_history(sbox):
   # First "oddity", the full log for mu2 doesn't include r3, but the -r3
   # log works!
   peg_mu2_path = mu2_path + "@3"
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-r', '3',
                                                               peg_mu2_path)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [3])
 
   peg_mu2_URL = mu2_URL + "@3"
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-r', '3',
                                                               peg_mu2_URL)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [3])
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-r', '2',
                                                               mu2_path)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [2])
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-r', '2',
                                                               mu2_URL)
   log_chain = parse_log_output(output)
@@ -980,7 +980,7 @@ PROPS-END
 
   # run log
   exit_code, output, errput = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', URL)
+    None, [], 'log', URL)
 
   # Verify the output contains either the expected fuzzy escape
   # sequence, or the literal control char.
@@ -1010,7 +1010,7 @@ def log_xml_empty_date(sbox):
 
   # Ensure that we get a date before we delete the property.
   exit_code, output, errput = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '--xml', '-r1', sbox.wc_dir)
+    None, [], 'log', '--xml', '-r1', sbox.wc_dir)
 
   matched = 0
   for line in output:
@@ -1020,12 +1020,12 @@ def log_xml_empty_date(sbox):
     raise svntest.Failure("log contains no date element")
 
   # Set the svn:date revprop to the empty string on revision 1.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'pdel', '--revprop', '-r1', 'svn:date',
                                      sbox.wc_dir)
 
   exit_code, output, errput = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '--xml', '-r1', sbox.wc_dir)
+    None, [], 'log', '--xml', '-r1', sbox.wc_dir)
 
   for line in output:
     if date_re.search(line):
@@ -1036,14 +1036,14 @@ def log_limit(sbox):
   "svn log --limit"
   guarantee_repos_and_wc(sbox)
 
-  exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
                                                            'log',
                                                            '--limit', '2',
                                                            sbox.repo_url)
   log_chain = parse_log_output(out)
   check_log_chain(log_chain, [9, 8])
 
-  exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
                                                            'log',
                                                            '--limit', '2',
                                                            sbox.repo_url,
@@ -1052,7 +1052,7 @@ def log_limit(sbox):
   check_log_chain(log_chain, [9, 6])
 
   exit_code, out, err = svntest.actions.run_and_verify_svn(
-    None, None, [],
+    None, [],
     'log', '--limit', '2', '--revision', '2:HEAD', sbox.repo_url, 'A/B')
 
   log_chain = parse_log_output(out)
@@ -1060,7 +1060,7 @@ def log_limit(sbox):
 
   # Use -l instead of --limit to test both option forms.
   exit_code, out, err = svntest.actions.run_and_verify_svn(
-    None, None, [],
+    None, [],
     'log', '-l', '2', '--revision', '1', sbox.repo_url, 'A/B')
 
   log_chain = parse_log_output(out)
@@ -1069,11 +1069,11 @@ def log_limit(sbox):
   must_be_positive = ".*Argument to --limit must be positive.*"
 
   # error expected when limit <= 0
-  svntest.actions.run_and_verify_svn(None, None, must_be_positive,
+  svntest.actions.run_and_verify_svn(None, must_be_positive,
                                      'log', '--limit', '0', '--revision', '1',
                                      sbox.repo_url, 'A/B')
 
-  svntest.actions.run_and_verify_svn(None, None, must_be_positive,
+  svntest.actions.run_and_verify_svn(None, must_be_positive,
                                      'log', '--limit', '-1', '--revision', '1',
                                      sbox.repo_url, 'A/B')
 
@@ -1083,16 +1083,16 @@ def log_base_peg(sbox):
 
   target = os.path.join(sbox.wc_dir, 'A', 'B', 'E', 'beta') + '@BASE'
 
-  exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
                                                            'log', target)
 
   log_chain = parse_log_output(out)
   check_log_chain(log_chain, [9, 1])
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'update', '-r', '1',
+  svntest.actions.run_and_verify_svn(None, [], 'update', '-r', '1',
                                      sbox.wc_dir)
 
-  exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
                                                            'log', target)
 
   log_chain = parse_log_output(out)
@@ -1103,7 +1103,7 @@ def log_verbose(sbox):
   "run log with verbose output"
   guarantee_repos_and_wc(sbox)
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-v',
                                                               sbox.wc_dir)
 
@@ -1262,7 +1262,7 @@ def merge_sensitive_log_single_revision(
     }
   os.chdir(TRUNK_path)
   # First try a single rev using -rN
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               '-r14')
 
@@ -1270,7 +1270,7 @@ def merge_sensitive_log_single_revision(
   log_chain = parse_log_output(output)
   check_merge_results(log_chain, expected_merges)
   # Then try a single rev using --limit 1
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               '--limit', '1',
                                                               '-r14:1')
@@ -1285,13 +1285,13 @@ def merge_sensitive_log_single_revision(
       11 : [12],
     }
   # First try a single rev using -rN
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               '-r12',
                                                               BRANCH_B_path)
   log_chain = parse_log_output(output)
   check_merge_results(log_chain, expected_merges)
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               '--limit', '1',
                                                               '-r12:1',
@@ -1311,7 +1311,7 @@ def merge_sensitive_log_branching_revisi
   BRANCH_B_path = os.path.join(wc_dir, "branches", "b")
 
   # Run log on a copying revision
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               '-r10',
                                                               BRANCH_B_path)
@@ -1333,7 +1333,7 @@ def merge_sensitive_log_non_branching_re
   TRUNK_path = os.path.join(sbox.wc_dir, "trunk")
 
   # Run log on a non-copying revision that adds mergeinfo
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               '-r6',
                                                               TRUNK_path)
@@ -1357,7 +1357,7 @@ def merge_sensitive_log_added_path(sbox)
   XI_path = os.path.join(sbox.wc_dir, "trunk", "A", "xi")
 
   # Run log on a non-copying revision that adds mergeinfo
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               XI_path)
 
@@ -1387,7 +1387,7 @@ def log_single_change(sbox):
   guarantee_repos_and_wc(sbox)
   repo_url = sbox.repo_url
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-c',
                                                               4, repo_url)
   log_chain = parse_log_output(output)
@@ -1399,7 +1399,7 @@ def log_changes_range(sbox):
   guarantee_repos_and_wc(sbox)
   repo_url = sbox.repo_url
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-c',
                                                               '2-5', repo_url)
 
@@ -1412,7 +1412,7 @@ def log_changes_list(sbox):
   guarantee_repos_and_wc(sbox)
   repo_url = sbox.repo_url
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-c',
                                                               '2,5,7',
                                                               repo_url)
@@ -1426,7 +1426,7 @@ def log_changes_complex(sbox):
   guarantee_repos_and_wc(sbox)
   repo_url = sbox.repo_url
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-c',
                                                               '2,5-3,-8,6-7', repo_url)
 
@@ -1482,10 +1482,10 @@ def retrieve_revprops(sbox):
 
   # Set custom property on r1 and r2.
   svntest.actions.run_and_verify_svn(
-    None, None, [],        # message, expected_stdout, expected_stderr
+    None, [],        # message, expected_stdout, expected_stderr
     'ps', '--revprop', '-r1', custom_name, custom_value, sbox.repo_url)
   svntest.actions.run_and_verify_svn(
-    None, None, [],        # message, expected_stdout, expected_stderr
+    None, [],        # message, expected_stdout, expected_stderr
     'ps', '--revprop', '-r2', custom_name, custom_value, sbox.repo_url)
 
   # Can't set revprops with log.
@@ -1580,8 +1580,8 @@ def merge_sensitive_log_target_with_bogu
   svntest.main.run_svn(None, 'ci', '-m', 'setting bogus mergeinfo', wc_path)
 
   # The tests: Check that 'svn log -g' doesn't error on these.
-  svntest.actions.run_and_verify_svn(None, None, [], 'log', '-g', C_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'log', '-g', D_path)
+  svntest.actions.run_and_verify_svn(None, [], 'log', '-g', C_path)
+  svntest.actions.run_and_verify_svn(None, [], 'log', '-g', D_path)
 
 @SkipUnless(server_has_mergeinfo)
 @Issue(3235)
@@ -1671,8 +1671,7 @@ def merge_sensitive_log_added_mergeinfo_
   # Reverse merge r3 from 'A/D/H' to 'A_COPY/D/H' and commit as r8.
   # First update the wc so mergeinfo inheritance can occur.  This is
   # necessary so A_COPY/D/H 'knows' that r3 has been merged into it.
-  svntest.actions.run_and_verify_svn(None,
-                                     exp_noop_up_out(7), [],
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [],
                                      'up', wc_dir)
   wc_status.tweak(wc_rev=7)
   expected_output = wc.State(H_COPY_path, {
@@ -1735,7 +1734,7 @@ def merge_sensitive_log_added_mergeinfo_
       8 : []}
     expected_reverse_merges = {
       3 : [8]}
-    exit_code, output, err = svntest.actions.run_and_verify_svn(None, None,
+    exit_code, output, err = svntest.actions.run_and_verify_svn(None,
                                                                 [],
                                                                 'log', '-g',
                                                                 '-r8',
@@ -1788,7 +1787,7 @@ def merge_sensitive_log_propmod_merge_in
       3 : [7],
       }
     exit_code, output, err = svntest.actions.run_and_verify_svn(
-      None, None, [], 'log', '-g', '-r7', log_target)
+      None, [], 'log', '-g', '-r7', log_target)
     log_chain = parse_log_output(output)
     check_merge_results(log_chain, expected_merges)
   run_log_g_r7(wc_dir)
@@ -1798,7 +1797,7 @@ def merge_sensitive_log_propmod_merge_in
   def run_log_g_r8(log_target):
     expected_merges = { 8 : [] }
     exit_code, output, err = svntest.actions.run_and_verify_svn(
-      None, None, [], 'log', '-g', '-r8', log_target)
+      None, [], 'log', '-g', '-r8', log_target)
     log_chain = parse_log_output(output)
     check_merge_results(log_chain, expected_merges)
   run_log_g_r8(wc_dir)
@@ -1820,14 +1819,14 @@ def log_of_local_copy(sbox):
 
   # Get the logs for a directory and a file.
   exit_code, C_log_out, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-v', C_path)
+    None, [], 'log', '-v', C_path)
   exit_code, psi_log_out, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-v', psi_path)
+    None, [], 'log', '-v', psi_path)
 
   # Move that directory and file.
-  svntest.actions.run_and_verify_svn(None, None, [], 'mv',
+  svntest.actions.run_and_verify_svn(None, [], 'mv',
                                      C_path, C_moved_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'mv',
+  svntest.actions.run_and_verify_svn(None, [], 'mv',
                                      psi_path, psi_moved_path)
 
   # Get the logs for the move destinations.
@@ -1843,9 +1842,9 @@ def log_of_local_copy(sbox):
   #    svn: File not found: revision 9, path '/A/C_MOVED'
   #
   exit_code, C_moved_log_out, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-v', C_moved_path)
+    None, [], 'log', '-v', C_moved_path)
   exit_code, psi_moved_log_out, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-v', psi_moved_path)
+    None, [], 'log', '-v', psi_moved_path)
 
   # The logs of the move source and destinations should be the same.
   if C_log_out != C_moved_log_out:
@@ -1886,7 +1885,7 @@ def merge_sensitive_log_reverse_merges(s
   svntest.main.run_svn(None, 'up', wc_dir)
 
   # Run log -g on path with explicit mergeinfo (A_COPY).
-  exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
                                                            'log', '-g', '-r8',
                                                            A_COPY_path)
   log_chain = parse_log_output(out)
@@ -1902,7 +1901,7 @@ def merge_sensitive_log_reverse_merges(s
   check_merge_results(log_chain, expected_merges, expected_reverse_merges)
 
   # Run log -g on path with inherited mergeinfo (A_COPY/D).
-  exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
                                                            'log', '-g', '-r8',
                                                            D_COPY_path)
   log_chain = parse_log_output(out)
@@ -2006,7 +2005,7 @@ def merge_sensitive_log_ignores_cyclic_m
     1  : [],
   }
   svntest.main.run_svn(None, 'up', wc_dir)
-  exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
                                                            'log', '-g',
                                                            A_path)
   log_chain = parse_log_output(out)
@@ -2023,21 +2022,21 @@ def log_with_unrelated_peg_and_operative
 
   # log for /A/D/G/rho, deleted in revision 5, recreated in revision 8
   expected_error = ".*(File|path) not found.*"
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-r', '6:7', target)
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-r', '7:6', target)
 
   expected_error = ".*Unable to find repository location for.*"
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-r', '2:9', target)
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-r', '9:2', target)
 
   expected_error = ".*Unable to find repository location for.*"
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-r', '2:HEAD', target)
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-r', 'HEAD:2', target)
 
 #----------------------------------------------------------------------
@@ -2052,19 +2051,19 @@ def log_on_nonexistent_path_and_valid_re
   bad_path_real_rev    = sbox.repo_url + '/Z@1'
   bad_path_default_rev = sbox.repo_url + '/Z'
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'log', '-q', real_path_real_rev)
 
   expected_error = ".*No such revision 99*"
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-q', real_path_bad_rev)
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-q', bad_url_bad_rev)
 
   expected_error = ".*not found.*"
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-q', bad_path_real_rev)
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'log', '-q', bad_path_default_rev)
 
 #----------------------------------------------------------------------
@@ -2128,7 +2127,7 @@ def merge_sensitive_log_copied_path_inhe
   expected_merges = {5  : []}
   svntest.main.run_svn(None, 'up', wc_dir)
   exit_code, out, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-g', '--stop-on-copy',
+    None, [], 'log', '-g', '--stop-on-copy',
     sbox.repo_url + '/A/C/gamma')
   log_chain = parse_log_output(out)
   check_merge_results(log_chain, expected_merges)
@@ -2142,7 +2141,7 @@ def log_diff(sbox):
   was_cwd = os.getcwd()
   os.chdir(sbox.wc_dir)
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '--diff')
   os.chdir(was_cwd)
 
@@ -2160,7 +2159,7 @@ def log_diff(sbox):
   sbox.simple_commit()
 
   os.chdir(sbox.wc_dir)
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '--diff',
                                                               '-r10:8', 'A2')
   os.chdir(was_cwd)
@@ -2241,7 +2240,7 @@ def log_diff_moved(sbox):
                " now mu2\n",
                "+now mu3\n"]]
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '--diff',
                                                               mu_at_1)
   log_chain = parse_log_output(output, with_diffs=True)
@@ -2249,7 +2248,7 @@ def log_diff_moved(sbox):
     raise SVNLogParseError("%d logs found, 1 expected" % len(log_chain))
   compare_diff_output(r1diff, log_chain[0]['diff_lines'])
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '--diff',
                                                               '-r3', mu3_at_3)
   log_chain = parse_log_output(output, with_diffs=True)
@@ -2257,7 +2256,7 @@ def log_diff_moved(sbox):
     raise SVNLogParseError("%d logs found, 1 expected" % len(log_chain))
   compare_diff_output(r3diff, log_chain[0]['diff_lines'])
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '--diff',
                                                               '-r3:2', mu3_at_3)
   log_chain = parse_log_output(output, with_diffs=True)
@@ -2266,7 +2265,7 @@ def log_diff_moved(sbox):
   compare_diff_output(r3diff, log_chain[0]['diff_lines'])
   compare_diff_output(r2diff, log_chain[1]['diff_lines'])
 
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '--diff',
                                                               mu3_at_3)
   log_chain = parse_log_output(output, with_diffs=True)
@@ -2286,7 +2285,7 @@ def log_search(sbox):
   os.chdir(sbox.wc_dir)
 
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-                             None, None, [], 'log', '--search',
+                             None, [], 'log', '--search',
                              'for revision [367]')
 
   log_chain = parse_log_output(output)
@@ -2294,7 +2293,7 @@ def log_search(sbox):
 
   # search is case-sensitive
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-                             None, None, [], 'log', '--search',
+                             None, [], 'log', '--search',
                              'FOR REVISION [367]')
 
   log_chain = parse_log_output(output)
@@ -2302,7 +2301,7 @@ def log_search(sbox):
 
   # multi-pattern search
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-                             None, None, [], 'log',
+                             None, [], 'log',
                              '--search', 'for revision 3',
                              '--search', 'for revision 6',
                              '--search', 'for revision 7')
@@ -2312,7 +2311,7 @@ def log_search(sbox):
 
   # combined pattern search
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-                             None, None, [], 'log', '--verbose',
+                             None, [], 'log', '--verbose',
                              '--search', 'for revision 8',
                              '--search-and', 'test the code',
                              '--search', 'for revision 7',
@@ -2325,7 +2324,7 @@ def log_search(sbox):
   check_log_chain(log_chain, [8, 6])
 
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-                             None, None, [], 'log', '--verbose',
+                             None, [], 'log', '--verbose',
                              '--search', 'for revision 8',
                              '--search-and', 'this won\'t match ',
                              '--search', 'for revision 7',
@@ -2347,7 +2346,7 @@ def merge_sensitive_log_with_search(sbox
 
   # Run log -g on a non-copying revision that adds mergeinfo,
   # and perform a search that only matches the merged revision
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                                               'log', '-g',
                                                               '-r6',
                                                               '--search',
@@ -2418,13 +2417,13 @@ def log_multiple_revs_spanning_rename(sb
 
   # Check that log can handle a revision range that spans a rename.
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-r2:4', sbox.repo_url + '/trunk/mu')
+    None, [], 'log', '-r2:4', sbox.repo_url + '/trunk/mu')
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [2,3,4])
 
   # Check that log can handle discrete revisions that don't span a rename.
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-c3,4', sbox.repo_url + '/trunk/mu')
+    None, [], 'log', '-c3,4', sbox.repo_url + '/trunk/mu')
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [3,4])
 
@@ -2452,7 +2451,7 @@ def log_multiple_revs_spanning_rename(sb
   #     (apr_err=SVN_ERR_FS_NOT_FOUND)
   #   svn: E160013: File not found: revision 1, path '/trunk'
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-c2,3,1', sbox.repo_url + '/trunk/mu')
+    None, [], 'log', '-c2,3,1', sbox.repo_url + '/trunk/mu')
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [2,3,1])
 
@@ -2460,13 +2459,13 @@ def log_multiple_revs_spanning_rename(sb
 
   # Should work with a WC target too.
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-c2,3,1', mu_path2)
+    None, [], 'log', '-c2,3,1', mu_path2)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [2,3,1])
 
   # Discreet revision *ranges* which span a rename should work too.
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-r1', '-r4:2', sbox.repo_url + '/trunk')
+    None, [], 'log', '-r1', '-r4:2', sbox.repo_url + '/trunk')
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [1,4,3,2])
 
@@ -2487,23 +2486,23 @@ def log_multiple_revs_spanning_rename(sb
   #    (apr_err=SVN_ERR_FS_NOT_FOUND)
   #  svn: E160013: File not found: revision 4, path '/A'
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-r1', '-r2:4', sbox.repo_url + '/trunk')
+    None, [], 'log', '-r1', '-r2:4', sbox.repo_url + '/trunk')
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [1,2,3,4])
 
   # Discrete revs with WC-only opt revs shouldn't cause any problems.
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-r1', '-rPREV', trunk_path)
+    None, [], 'log', '-r1', '-rPREV', trunk_path)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [1,3])
 
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-r1', '-rCOMMITTED', trunk_path)
+    None, [], 'log', '-r1', '-rCOMMITTED', trunk_path)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [1,4])
 
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'log', '-r1', '-rBASE', trunk_path)
+    None, [], 'log', '-r1', '-rBASE', trunk_path)
   log_chain = parse_log_output(output)
   check_log_chain(log_chain, [1,4])
 
@@ -2522,29 +2521,26 @@ def mergeinfo_log(sbox):
   sbox.simple_update()
 
   # Dummy up some mergeinfo.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', SVN_PROP_MERGEINFO, '/A:3',
                                      sbox.ospath('A2'))
 
   # test --log
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None,
-                                     None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                      'mergeinfo', '--show-revs=merged',
                                      '--log', sbox.repo_url + '/A',
                                      sbox.ospath('A2'))
   check_log_chain(parse_log_output(output), [3])
 
   # test --log -v
-  exit_code, output, err = svntest.actions.run_and_verify_svn(None,
-                                     None, [],
+  exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
                                      'mergeinfo', '--show-revs=merged',
                                      '--log', '-v', sbox.repo_url + '/A',
                                      sbox.ospath('A2'))
   check_log_chain(parse_log_output(output), [3], [1])
 
   # test --log -q
-  svntest.actions.run_and_verify_svn(None,
-                                     None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mergeinfo', '--show-revs=merged',
                                      '--log', '-q', sbox.repo_url + '/A',
                                      sbox.ospath('A2'))



Mime
View raw message