subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1658686 [11/19] - in /subversion/branches/pin-externals: ./ build/generator/ build/generator/templates/ subversion/bindings/swig/ subversion/include/ subversion/libsvn_client/ subversion/libsvn_fs_fs/ subversion/libsvn_fs_x/ subversion/lib...
Date Tue, 10 Feb 2015 11:41:59 GMT
Modified: subversion/branches/pin-externals/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_authz_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/merge_authz_tests.py Tue Feb
10 11:41:57 2015
@@ -112,7 +112,7 @@ def mergeinfo_and_skipped_paths(sbox):
 
   # Checkout just the branch under the newly restricted authz.
   wc_restricted = sbox.add_wc_path('restricted')
-  svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+  svntest.actions.run_and_verify_svn(None, [], 'checkout',
                                      sbox.repo_url,
                                      wc_restricted)
 
@@ -337,7 +337,7 @@ def mergeinfo_and_skipped_paths(sbox):
                                        expected_skip,
                                        None, None, None, None,
                                        None, 1, 0)
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '--recursive',
+  svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive',
                                      wc_restricted)
 
   # Test issue #2997.  If a merge requires two separate editor drives and the
@@ -387,11 +387,11 @@ def mergeinfo_and_skipped_paths(sbox):
   # during a merge'
 
   # Revert previous changes to restricted WC
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '--recursive',
+  svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive',
                                      wc_restricted)
   # Add new path 'A/D/H/zeta'
   svntest.main.file_write(zeta_path, "This is the file 'zeta'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', zeta_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', zeta_path)
   expected_output = wc.State(wc_dir, {'A/D/H/zeta' : Item(verb='Adding')})
   wc_status.add({'A/D/H/zeta' : Item(status='  ', wc_rev=9)})
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
@@ -445,7 +445,7 @@ def mergeinfo_and_skipped_paths(sbox):
   # non-inheritable mergeinfo (due to the fact 'A_COPY_2/D/H/psi' is missing
   # and skipped). 'A_COPY_2/D/H/zeta' must therefore get its own explicit
   # mergeinfo from this merge.
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '--recursive',
+  svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive',
                                      wc_restricted)
   expected_output = wc.State(A_COPY_2_H_path, {
     'omega' : Item(status='U '),
@@ -528,11 +528,11 @@ def merge_fails_if_subtree_is_deleted_on
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                         expected_status, None, wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp', A_url, Acopy_url,
+  svntest.actions.run_and_verify_svn(None, [], 'cp', A_url, Acopy_url,
                                      '-m', 'create a new copy of A')
 
   # Update working copy
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   svntest.main.file_substitute(gamma_path, "line1", "this is line1")
   # Create expected output tree for commit
@@ -569,7 +569,7 @@ def merge_fails_if_subtree_is_deleted_on
                                         expected_status, None, wc_dir)
 
   # Delete A/D/gamma from working copy
-  svntest.actions.run_and_verify_svn(None, None, [], 'delete', gamma_path)
+  svntest.actions.run_and_verify_svn(None, [], 'delete', gamma_path)
   # Create expected output tree for commit
   expected_output = wc.State(wc_dir, {
     'A/D/gamma' : Item(verb='Deleting'),
@@ -583,7 +583,6 @@ def merge_fails_if_subtree_is_deleted_on
                                         None,
                                         wc_dir, wc_dir)
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[3,4]],
                           ['U    ' + Acopy_gamma_path + '\n',
                            ' U   ' + Acopy_gamma_path + '\n']),
@@ -603,7 +602,6 @@ def merge_fails_if_subtree_is_deleted_on
   # see notes/tree-conflicts/detection.txt, but --force currently avoids
   # this.
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[3,6]],
                           ['D    ' + Acopy_gamma_path + '\n',
                            ' U   ' + Acopy_path + '\n']),
@@ -657,7 +655,7 @@ def reintegrate_fails_if_no_root_access(
                                            'U    ' + psi_COPY_path   + '\n',
                                            # Mergeinfo notification
                                            ' U   ' + A_COPY_path     + '\n'])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'merge',
+  svntest.actions.run_and_verify_svn(expected_output, [], 'merge',
                                      sbox.repo_url + '/A', A_COPY_path)
   sbox.simple_commit(message='synch A_COPY with A')
 
@@ -743,13 +741,13 @@ def diff_unauth_parent(sbox):
   sbox.build(create_wc=False)
 
   # Create r2: Change A a bit
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                                          'propset', 'k', 'v',
                                          sbox.repo_url + '/A',
                                          '-m', 'set prop')
 
   # Create r3 Mark E and G
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                                          'propset', 'this-is', 'E',
                                          sbox.repo_url + '/A/B/E',
                                          'propset', 'this-is', 'G',
@@ -757,7 +755,7 @@ def diff_unauth_parent(sbox):
                                          '-m', 'set prop')
 
   # Create r4: Replace A/B/E with A/D/G
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                                          'rm', sbox.repo_url + '/A/B/E',
                                          'cp', '3', sbox.repo_url + '/A/D/G',
                                          sbox.repo_url + '/A/B/E',
@@ -783,7 +781,7 @@ def diff_unauth_parent(sbox):
     '+v\n',
     '\ No newline at end of property\n'
   ]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', sbox.repo_url + '/A', '-c', '2')
 
   if is_ra_type_svn() or is_ra_type_dav():
@@ -871,7 +869,7 @@ def diff_unauth_parent(sbox):
 
   # Use two url diff, because 'svn diff url -c' uses copyfrom to diff against
   expected_output = svntest.verify.UnorderedOutput(expected_output)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', sbox.repo_url + '/A/B/E@3',
                                       sbox.repo_url + '/A/B/E@4',
                                       '--notice-ancestry')
@@ -900,7 +898,7 @@ def diff_unauth_parent(sbox):
     ]
 
   expected_output = svntest.verify.UnorderedOutput(expected_output)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', sbox.repo_url + '/A/B/E@3',
                                       sbox.repo_url + '/A/B/E@4',
                                       '--notice-ancestry', '--summarize')

Modified: subversion/branches/pin-externals/subversion/tests/cmdline/merge_automatic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_automatic_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/merge_automatic_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/merge_automatic_tests.py Tue
Feb 10 11:41:57 2015
@@ -188,7 +188,7 @@ def logical_changes_in_branch(sbox, bran
 def get_mergeinfo_change(sbox, target):
   """Return a list of revision numbers representing the mergeinfo change
   on TARGET (working version against base).  Non-recursive."""
-  exit, out, err = actions.run_and_verify_svn(None, None, [],
+  exit, out, err = actions.run_and_verify_svn(None, [],
                                               'diff', '--depth=empty',
                                               sbox.ospath(target))
   merged_revs = []
@@ -302,7 +302,7 @@ def automatic_merge(sbox, source, target
   before_changes = logical_changes_in_branch(sbox, target)
 
   exp_out = expected_automatic_merge_output(target, expect_3ways)
-  exit, out, err = svntest.actions.run_and_verify_svn(None, exp_out, [],
+  exit, out, err = svntest.actions.run_and_verify_svn(exp_out, [],
                                      'merge',
                                      '^/' + source, target,
                                      *args)
@@ -782,20 +782,20 @@ def subtree_to_and_fro(sbox):
 
   # r7 - Edit a file on the branch.
   svntest.main.file_write(A_COPY_gamma_path, "Branch edit to 'gamma'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+  svntest.actions.run_and_verify_svn(None, [], 'ci', wc_dir,
                                      '-m', 'Edit a file on our branch')
 
   # r8 - Do a subtree sync merge from ^/A/D to A_COPY/D.
   # Note that among other things this changes A_COPY/D/H/psi.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A/D', A_COPY_D_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+  svntest.actions.run_and_verify_svn(None, [], 'ci', wc_dir,
                                      '-m', 'Automatic subtree merge')
 
   # r9 - Make an edit to A/D/H/psi.
   svntest.main.file_write(psi_path, "Trunk Edit to 'psi'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+  svntest.actions.run_and_verify_svn(None, [], 'ci', wc_dir,
                                      '-m', 'Edit a file on our trunk')
 
   # Now reintegrate ^/A_COPY back to A.  Prior to issue #4258's fix, the
@@ -820,9 +820,9 @@ def subtree_to_and_fro(sbox):
   #    U   A
   #   Summary of conflicts:
   #     Text conflicts: 1
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   exit_code, out, err = svntest.actions.run_and_verify_svn(
-    None, [], svntest.verify.AnyOutput,
+    [], svntest.verify.AnyOutput,
     'merge', sbox.repo_url + '/A_COPY', A_path)
 
   # Better to produce the same warning that explicitly using the
@@ -876,13 +876,13 @@ def merge_to_reverse_cherry_subtree_to_m
   #   Properties on 'A_COPY\B':
   #     svn:mergeinfo
   #       /A/B:2-4,6
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c-5',
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-c-5',
                                      sbox.repo_url + '/A/B',
                                      A_COPY_B_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir, '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', wc_dir, '-m',
                                      'sync merge and reverse subtree merge')
 
   # Try an automatic sync merge from ^/A to A_COPY.  Revision 5 should be
@@ -917,7 +917,7 @@ def merge_to_reverse_cherry_subtree_to_m
   #   ___________________________________________________________________
   #   Modified: svn:mergeinfo
   #      Merged /A:r7
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_output = wc.State(A_COPY_path, {
     'B/E/beta'   : Item(status='U '),
     })
@@ -1117,7 +1117,6 @@ def auto_merge_handles_replacements_in_m
   #   unusual way.
   #   Please contact the application's support team for more information.
   svntest.actions.run_and_verify_svn(
-    None,
     ["--- Recording mergeinfo for merge of r2 into '" + branch2_path + "':\n",
      " U   " + branch2_path + "\n",
      "--- Recording mergeinfo for merge of r3 into '" + branch2_path + "':\n",
@@ -1175,7 +1174,7 @@ def effective_sync_results_in_reintegrat
     "--- Recording mergeinfo for merge between repository URLs into '" +
     A_path + "':\n",
     " U   " + A_path + "\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'merge',
+  svntest.actions.run_and_verify_svn(expected_output, [], 'merge',
                                      sbox.repo_url + '/branch', A_path,
                                      '--reintegrate')
 
@@ -1198,8 +1197,8 @@ def effective_sync_results_in_reintegrat
   # Conflict discovered in file 'A\mu'.
   # Select: (p) postpone, (df) diff-full, (e) edit, (m) merge,
   #         (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', A_path, '-R')
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'revert', A_path, '-R')
+  svntest.actions.run_and_verify_svn(expected_output, [], 'merge',
                                      sbox.repo_url + '/branch', A_path)
 
 @Issue(4481)
@@ -1225,7 +1224,7 @@ def reintegrate_subtree_not_updated(sbox
     + sbox.ospath('A/D/G') + "':\n",
     " U   "
     + sbox.ospath('A/D/G') + "\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'merge',
                                      sbox.repo_url + '/D_1/G',
                                      sbox.ospath('A/D/G'))
@@ -1238,7 +1237,7 @@ def reintegrate_subtree_not_updated(sbox
     + sbox.ospath('A/D/H') + "':\n",
     " U   "
     + sbox.ospath('A/D/H') + "\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'merge',
                                      sbox.repo_url + '/D_1/H',
                                      sbox.ospath('A/D/H'))
@@ -1274,7 +1273,7 @@ def reintegrate_subtree_not_updated(sbox
     + sbox.ospath('D_2/G') + "':\n",
     " U   "
     + sbox.ospath('D_2/G') + "\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'merge',
                                      sbox.repo_url + '/A/D',
                                      sbox.ospath('D_2'))
@@ -1295,7 +1294,7 @@ def reintegrate_subtree_not_updated(sbox
     + sbox.ospath('A/D') + "\n",
     " U   "
     + sbox.ospath('A/D/G') + "\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'merge',
                                      sbox.repo_url + '/D_2',
                                      sbox.ospath('A/D'))
@@ -1321,7 +1320,7 @@ def reintegrate_subtree_not_updated(sbox
     + sbox.ospath('D_2') + "\n",
     " G   "
     + sbox.ospath('D_2/G') + "\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'merge',
                                      sbox.repo_url + '/A/D',
                                      sbox.ospath('D_2'))

Modified: subversion/branches/pin-externals/subversion/tests/cmdline/merge_reintegrate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/merge_reintegrate_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/merge_reintegrate_tests.py
(original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/merge_reintegrate_tests.py
Tue Feb 10 11:41:57 2015
@@ -53,7 +53,7 @@ def run_reintegrate(src_url, tgt_path):
      there is nothing on stdout, anything on stderr, or a non-zero exit
      code.
   """
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'merge', '--reintegrate',
                                      src_url, tgt_path)
 
@@ -71,7 +71,7 @@ def run_reintegrate_expect_error(src_url
   # ourselves, but as the 'actual_stdout' argument, that way each line of
   # error must match the regex.
   exit_code, out, err = svntest.actions.run_and_verify_svn(
-                          None, expected_stdout, svntest.verify.AnyOutput,
+                          expected_stdout, svntest.verify.AnyOutput,
                           'merge', '--reintegrate',
                           src_url, tgt_path)
   assert exit_code
@@ -276,15 +276,14 @@ def basic_reintegrate(sbox):
   # targeting A_MOVED this time.  This should work with almost the same
   # results.  The only differences being the inclusion of r9 in the
   # mergeinfo and the A-->A_MOVED path difference.
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 9.\n'],
                                      [], 'move',
                                      sbox.repo_url + '/A',
                                      sbox.repo_url + '/A_MOVED',
                                      '-m', 'Copy A to A_MOVED')
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   A_MOVED_path = sbox.ospath('A_MOVED')
   expected_output = wc.State(A_MOVED_path, {
     'mu'           : Item(status='U '),
@@ -479,7 +478,7 @@ def reintegrate_with_rename(sbox):
 
   # Make another change on the branch: copy tau to tauprime.  Commit
   # in r9.
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+  svntest.actions.run_and_verify_svn(None, [], 'cp',
                                      sbox.repo_url + '/A_COPY/D/G/tau',
                                      sbox.repo_url + '/A_COPY/D/G/tauprime',
                                      '-m',
@@ -597,7 +596,7 @@ def reintegrate_branch_never_merged_to(s
 
   # Make another change on the branch: copy tau to tauprime.  Commit
   # in r8.
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+  svntest.actions.run_and_verify_svn(None, [], 'cp',
                                      os.path.join(wc_dir, 'A_COPY', 'D', 'G',
                                                   'tau'),
                                      os.path.join(wc_dir, 'A_COPY', 'D', 'G',
@@ -847,8 +846,8 @@ def reintegrate_on_shallow_wc(sbox):
   # depth of A/D to empty.  Since the only change made on the branch
   # since the branch point is to A_COPY/mu, the reintegrate should
   # simply work and update A/mu with the branch's contents.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--set-depth', 'empty', A_D_path)
   expected_output = wc.State(A_path, {
     'mu' : Item(status='U '),
@@ -899,7 +898,7 @@ def reintegrate_on_shallow_wc(sbox):
   # branch in r4, but this time change a subtree that corresponds
   # to the missing (shallow) portion of the source.  The reintegrate
   # should still succeed.
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
   svntest.main.file_write(psi_COPY_path, "more branch work")
   svntest.main.run_svn(None, 'commit', '-m',
                        'Some more work on the A_COPY branch', wc_dir)
@@ -942,10 +941,10 @@ def reintegrate_fail_on_stale_source(sbo
   A_path = sbox.ospath('A')
   mu_path = os.path.join(A_path, "mu")
   svntest.main.file_append(mu_path, 'some text appended to mu\n')
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '-m', 'a change to mu', mu_path)
   # Unmix the revisions in the working copy.
-  svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
   # The merge --reintegrate succeeds but since there were no changes
   # on A_COPY after it was branched the only result is updated mergeinfo
   # on the reintegrate target.
@@ -1024,17 +1023,17 @@ def merge_file_with_space_in_its_path(sb
   os.mkdir(some_dir)
   svntest.main.file_append(file1, "Initial text in the file.\n")
   svntest.main.run_svn(None, "add", some_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "ci", "-m", "r2", wc_dir)
 
   # Make r3.
   svntest.main.run_svn(None, "copy", file1, file2)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "ci", "-m", "r3", wc_dir)
 
   # Make r4.
   svntest.main.file_append(file2, "Next line of text in the file.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "ci", "-m", "r4", wc_dir)
 
   target_url = sbox.repo_url + '/some%20dir/file2'
@@ -1109,11 +1108,10 @@ def reintegrate_with_subtree_mergeinfo(s
   # r10 - Merge r9 from A_COPY_3/D to A/D, creating explicit subtree
   # mergeinfo under A.  For this and every subsequent merge we update the WC
   # first to allow full inheritance and elision.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(9), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(9), [], 'up',
                                      wc_dir)
   expected_status.tweak(wc_rev=9)
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[9]],
                           ['U    ' + gamma_path + '\n',
                            ' U   ' + D_path     + '\n',]),
@@ -1133,11 +1131,10 @@ def reintegrate_with_subtree_mergeinfo(s
                                         expected_status, None, wc_dir)
 
   # r12 - Merge r11 from A_COPY_2/mu to A_COPY/mu
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(11), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(11), [], 'up',
                                      wc_dir)
   expected_status.tweak(wc_rev=11)
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[11]],
                           ['U    ' + mu_COPY_path + '\n',
                            ' U   ' + mu_COPY_path + '\n',]),
@@ -1150,11 +1147,10 @@ def reintegrate_with_subtree_mergeinfo(s
 
   # r13 - Do a 'synch' cherry harvest merge of all available revisions
   # from A to A_COPY
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(12), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(12), [], 'up',
                                      wc_dir)
   expected_status.tweak(wc_rev=12)
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[2,12]],
                           ['U    ' + beta_COPY_path  + '\n',
                            'U    ' + gamma_COPY_path + '\n',
@@ -1194,7 +1190,7 @@ def reintegrate_with_subtree_mergeinfo(s
                                         expected_status, None, wc_dir)
 
   # Now, reintegrate A_COPY to A.  This should succeed.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(14), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(14), [], 'up',
                                      wc_dir)
   expected_status.tweak(wc_rev=14)
   expected_output = wc.State(A_path, {
@@ -1283,12 +1279,11 @@ def reintegrate_with_subtree_mergeinfo(s
   #   A_COPY_2        3-------------[11]--
 
   # First revert the previous reintegrate merge
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', '-R', wc_dir)
 
   # r15 - Reverse Merge r8 from A/D to A_COPY/D.
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[-8]],
                           ['U    ' + omega_COPY_path + '\n',
                            ' U   ' + D_COPY_path     + '\n',]),
@@ -1353,12 +1348,12 @@ def reintegrate_with_subtree_mergeinfo(s
   # r874258 WC-to-WC moves won't create mergeinfo on the dest if the source
   # doesn't have any.  So do a repos-to-repos move so explicit mergeinfo
   # *is* created on the destination.
-  svntest.actions.run_and_verify_svn(None, None,[], 'move',
+  svntest.actions.run_and_verify_svn(None,[], 'move',
                                      sbox.repo_url + '/A/D/gamma',
                                      sbox.repo_url + '/A/D/gamma_moved',
                                      '-m', 'REPOS-to-REPOS move'
                                      )
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_status.tweak(wc_rev=16)
   expected_status.remove('A/D/gamma')
   expected_status.add({'A/D/gamma_moved' : Item(status='  ', wc_rev=16)})
@@ -1373,7 +1368,6 @@ def reintegrate_with_subtree_mergeinfo(s
   # behavior pass.
   # r17 - B) Synch merge from A to A_COPY
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[8], [13,16], [2,16]],
                           ['U    ' + omega_COPY_path + '\n',
                            'A    ' + gamma_moved_COPY_path + '\n',
@@ -1410,7 +1404,6 @@ def reintegrate_with_subtree_mergeinfo(s
 
   # r19 - D) Synch merge from A to A_COPY
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[17,18], [2,18]],
                           ['U    ' + gamma_moved_COPY_path + '\n',
                            ' U   ' + A_COPY_path + '\n',
@@ -1438,7 +1431,7 @@ def reintegrate_with_subtree_mergeinfo(s
   #   /A_COPY/D/gamma_moved:17-19
   #
   # shows that it is fully synched up with trunk.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(19), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(19), [], 'up',
                                      wc_dir)
   expected_output = wc.State(A_path, {
     'B/E/alpha'     : Item(status='U '),
@@ -1563,71 +1556,71 @@ def multiple_reintegrates_from_the_same_
   # the reintegrate target.
   #
   # r7 - Create the feature branch.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy', A_path, Feature_branch_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'Make a feature branch',
                                      wc_dir)
 
   # r8 - Make a change under 'A'.
   svntest.main.file_write(mu_path, "New trunk content.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "A text change under 'A'",
                                      wc_dir)
 
   # r9 - Make a change on the feature branch.
   svntest.main.file_write(Feature_beta_path, "New branch content.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "A text change on the feature branch",
                                      wc_dir)
 
   # r10 - Sync merge all changes from 'A' to the feature branch.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A',
                                      Feature_branch_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "Sync merge 'A' to feature branch",
                                      wc_dir)
 
   # r11 - Reintegrate the feature branch back to 'A'.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   run_reintegrate(sbox.repo_url + '/A_FEATURE_BRANCH', A_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "Reintegrate feature branch back to 'A'",
                                      wc_dir)
 
   # r12 - Do a --record-only merge from 'A' to the feature branch so we
   # don't try to merge r11 from trunk during the next sync merge.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c11',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-c11',
                                      '--record-only',
                                      sbox.repo_url + '/A',
                                      Feature_branch_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "Sync merge 'A' to feature branch",
                                      wc_dir)
 
   # r13 - Make another change on the feature branch.
   svntest.main.file_write(Feature_beta_path, "Even newer branch content.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "Different text on the feature branch",
                                      wc_dir)
 
   # r14 - Sync merge all changes from 'A' to the feature branch in
   # preparation for a second reintegrate from this branch.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A',
                                      Feature_branch_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "2nd Sync merge 'A' to feature branch",
                                      wc_dir)
 
   # r15 - Reintegrate the feature branch back to 'A' a second time.
   # No self-referential mergeinfo should be applied on 'A'.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_output = wc.State(A_path, {
      #'' : Item(status=' U'), #<-- no self-referential mergeinfo applied!
     'B/E/beta' : Item(status='U '),
@@ -1694,24 +1687,23 @@ def multiple_reintegrates_from_the_same_
                                        expected_status,
                                        expected_skip,
                                        None, 1, 1)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "2nd Reintegrate feature branch back to 'A'",
                                      wc_dir)
 
   # Demonstrate the danger of any self-referential mergeinfo on trunk.
   #
   # Merge all available revisions except r3 from 'A' to 'A_COPY'.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-r3:HEAD',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-r3:HEAD',
                                      sbox.repo_url + '/A',
                                      A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      "Merge -r3:HEAD from 'A' to 'A_COPY'",
                                      wc_dir)
   # No self-referential mergeinfo should have been carried on 'A_COPY' from
   # 'A' that would prevent the following merge from being operative.
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[2,3],[2,16]],
                           ['U    ' + psi_COPY_path + '\n',
                            ' U   ' + A_COPY_path   + '\n',]),
@@ -1744,38 +1736,38 @@ def reintegrate_with_self_referential_me
 
   # r6 Copy A to A2 and then manually set some self-referential mergeinfo on
   # A2/B and A2.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(5), [],
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(5), [],
                                      'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy', A_path, A2_path)
   # /A:3 describes A2's natural history, a.k.a. it's implicit mergeinfo, so
   # it is self-referential.  Same for /A/B:4 and A2/B.  Normally this is
   # redundant but not harmful.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'svn:mergeinfo', '/A:3', A2_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'svn:mergeinfo', '/A/B:4', A2_B_path)
   svntest.actions.run_and_verify_svn(
-    None, None, [], 'ci', '-m',
+    None, [], 'ci', '-m',
     'copy A to A2 and set some self-referential mergeinfo on the latter.',
     wc_dir)
 
   # r7 Copy A2 to A2.1
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy', A2_path, A2_1_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'copy A2to A2.1.', wc_dir)
 
   # r8 Make a change on A2.1/mu
   svntest.main.file_write(A2_1_mu_path, 'New A2.1 stuff')
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Work done on the A2.1 branch.',
                                      wc_dir)
 
   # Update to uniform revision and reintegrate A2.1 back to A2.
   # Note that the mergeinfo on A2/B is not changed by the reintegration
   # and so is not expected to by updated to describe the merge.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(8), [],
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [],
                                      'up', wc_dir)
   expected_output = wc.State(A2_path, {
     'mu' : Item(status='U '),
@@ -1886,20 +1878,20 @@ def reintegrate_with_subtree_merges(sbox
   # from A to A_COPY, but do it via subtree merges so the mergeinfo
   # record of the merges insn't neatly reflected in the root of the
   # branch.  Commit the merge as r8.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c5',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-c5',
                                      sbox.repo_url + '/A/B',
                                      B_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c4',
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-c4',
                                      sbox.repo_url + '/A/D/G/rho',
                                      rho_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c3',
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-c3',
                                      sbox.repo_url + '/A/D/H',
                                      H_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c6',
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-c6',
                                      sbox.repo_url + '/A',
                                      A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'commit', '-m',
                                      'Merge everything from A to A_COPY',
                                      wc_dir)
 
@@ -1924,7 +1916,7 @@ def reintegrate_with_subtree_merges(sbox
   #        Missing ranges: /A/D/G/rho:2-3,5-6
   #      A_COPY/D/H
   #        Missing ranges: /A/D/H:2,4-5
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_output = wc.State(A_path, {
     'mu' : Item(status='U '),
     })
@@ -1992,7 +1984,7 @@ def reintegrate_with_subtree_merges(sbox
   # It should succeed because the automatic merge code should detect that
   # a reintegrate-style merge is required, that merge should succeed and
   # there should be not conflict on A/D/H/psi.
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
   svntest.main.file_write(psi_path, "Non-conflicting trunk edit.\n")
   svntest.main.run_svn(None, 'commit', '-m',
                        'An edit on trunk prior to reintegrate.', wc_dir)
@@ -2034,93 +2026,93 @@ def added_subtrees_with_mergeinfo_break_
 
   # r8 - Add a new file A_COPY_2/C/nu.
   svntest.main.file_write(nu_COPY_2_path, "This is the file 'nu'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', nu_COPY_2_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'add', nu_COPY_2_path)
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Add new file in A_COPY_2 branch',
                                      wc_dir)
 
 
   # r9 - Cyclic cherry pick merge r8 from A_COPY_2 back to A.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'merge', '-c', '8',
                                      sbox.repo_url + '/A_COPY_2',
                                      A_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Merge r8 from A_COPY_2 to A.',
                                      wc_dir)
 
   # r10 - Make an edit to A_COPY_2/C/nu.
   svntest.main.file_write(nu_COPY_2_path, "A_COPY_2 edit to file 'nu'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Edit new file on A_COPY_2 branch',
                                      wc_dir)
 
   # r11 - Cyclic subtree cherry pick merge r10 from A_COPY_2/C/nu
   # back to A/C/nu.
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'merge', '-c', '10',
                                      sbox.repo_url + '/A_COPY_2/C/nu',
                                      nu_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Merge r8 from A_COPY_2/C/nu to A/C/nu.',
                                      wc_dir)
 
   # r12 - Edit under A_COPY.
   svntest.main.file_write(mu_path, "mu edits on A_COPY.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Work on A_COPY branch.',
                                      wc_dir)
 
   # r13 - Sync merge A to A_COPY in preparation for reintegrate.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'merge', sbox.repo_url + '/A', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Prep for reintegrate: Sync A to A_COPY.',
                                      wc_dir)
 
   # r14 - Reintegrate A_COPY to A.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   run_reintegrate(sbox.repo_url + '/A_COPY', A_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Reintegrate A_COPY to A.',
                                      wc_dir)
 
   # r15 - Delete A_COPY.
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'delete', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Delete A_COPY branch', wc_dir)
 
   # r16 - Create new A_COPY from A@HEAD=15.
   #
   # Update so we copy HEAD:
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'copy', A_path, A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Create new A_COPY branch from A', wc_dir)
 
   # r17 - Unrelated edits under both A and A_COPY.
   svntest.main.file_write(nu_path, "Trunk work on nu.\n")
   svntest.main.file_write(lambda_COPY_path, "lambda edit on A_COPY.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Unrelated edits on A and A_COPY branch.',
                                      wc_dir)
 
   # r18 - Sync A to A_COPY in preparation for another reintegrate.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'merge', sbox.repo_url + '/A', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Prep for reintegrate: Sync A to A_COPY.',
                                      wc_dir)
 
   # Reintegrate A_COPY back to A.  We just synced A_COPY with A, so this
   # should work.  The only text change should be the change made to
   # A_COPY/B/lambda in r17 after the new A_COPY was created.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_output = wc.State(A_path, {
     ''         : Item(status=' U'),
     'B/lambda' : Item(status='U '),
@@ -2226,42 +2218,40 @@ def two_URL_merge_removes_valid_mergeinf
 
   # r8 - A simple text edit on the A_COPY branch.
   svntest.main.file_write(lambda_COPY_path, "Edit on 'branch 1'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', "Work on 'branch 1'.",
                                      wc_dir)
 
   # r9 - Sync the A_COPY branch with A up the HEAD (r8).  Now A_COPY
   # differs from A only by the change made in r8 and by the mergeinfo
   # '/A:2-8' on A_COPY which was set to describe the merge.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'merge', sbox.repo_url + '/A', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Sync A to A_COPY.',
                                      wc_dir)
 
   # r10 - A simple text edit on our "trunk" A.
   svntest.main.file_write(mu_path, "Edit on 'trunk'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', "Work on 'trunk'",
                                      wc_dir)
 
   # r11 - Sync the A_COPY_2 branch with A up to HEAD (r10).
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'merge', sbox.repo_url + '/A',
                                      A_COPY_2_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Sync A to A_COPY_2.',
                                      wc_dir)
 
   # Confirm that the mergeinfo on each branch is what we expect.
-  svntest.actions.run_and_verify_svn(None,
-                                     [A_COPY_path + ' - /A:2-8\n'],
+  svntest.actions.run_and_verify_svn([A_COPY_path + ' - /A:2-8\n'],
                                      [], 'pg', SVN_PROP_MERGEINFO,
                                      '-R', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None,
-                                     [A_COPY_2_path + ' - /A:3-10\n'],
+  svntest.actions.run_and_verify_svn([A_COPY_2_path + ' - /A:3-10\n'],
                                      [], 'pg', SVN_PROP_MERGEINFO,
                                      '-R', A_COPY_2_path)
 
@@ -2296,7 +2286,7 @@ def two_URL_merge_removes_valid_mergeinf
   #
   # Before issue #3648 was fixed this test failed because the valid mergeinfo
   # '/A:r3-8' on A_COPY_2 was removed by the merge.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_output = wc.State(A_COPY_2_path, {
     ''         : Item(status=' G'),
     'B/lambda' : Item(status='U '),
@@ -2530,7 +2520,7 @@ def no_source_subtree_mergeinfo(sbox):
 
   # Verify that merge results in no subtree mergeinfo
   expected_stderr = '.*W200017: Property.*not found'
-  svntest.actions.run_and_verify_svn(None, [], expected_stderr,
+  svntest.actions.run_and_verify_svn([], expected_stderr,
                                      'propget', 'svn:mergeinfo',
                                      sbox.repo_url + '/A/B2/E')
 
@@ -2540,7 +2530,7 @@ def no_source_subtree_mergeinfo(sbox):
   svntest.main.run_svn(None, 'update', wc_dir)
 
   # Verify that there is still no subtree mergeinfo
-  svntest.actions.run_and_verify_svn(None, [], expected_stderr,
+  svntest.actions.run_and_verify_svn([], expected_stderr,
                                      'propget', 'svn:mergeinfo',
                                      sbox.repo_url + '/A/B2/E')
 



Mime
View raw message