subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1658462 [23/31] - in /subversion/branches/move-tracking-2: ./ build/ build/generator/ build/generator/templates/ notes/ subversion/ subversion/bindings/cxxhl/include/svncxxhl/ subversion/bindings/javahl/native/ subversion/bindings/javahl/n...
Date Mon, 09 Feb 2015 16:46:21 GMT
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/merge_tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/merge_tree_conflict_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/merge_tree_conflict_tests.py Mon Feb  9 16:46:16 2015
@@ -61,7 +61,7 @@ def delete_file_and_dir(sbox):
   B2_path = os.path.join(wc_dir, 'A', 'B2')
   B_url = sbox.repo_url + '/A/B'
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy', B_path, B2_path)
 
   expected_output = wc.State(wc_dir, {
@@ -85,7 +85,7 @@ def delete_file_and_dir(sbox):
   # Rev 3 delete E and lambda from B
   E_path = os.path.join(B_path, 'E')
   lambda_path = os.path.join(B_path, 'lambda')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'delete', E_path, lambda_path)
 
   expected_output = wc.State(wc_dir, {
@@ -106,7 +106,7 @@ def delete_file_and_dir(sbox):
     # Local mods in B2
     B2_E_path = os.path.join(B2_path, 'E')
     B2_lambda_path = os.path.join(B2_path, 'lambda')
-    svntest.actions.run_and_verify_svn(None, None, [],
+    svntest.actions.run_and_verify_svn(None, [],
                                        'propset', 'foo', 'foo_val',
                                        B2_E_path, B2_lambda_path)
     expected_status.tweak(
@@ -180,10 +180,10 @@ def merge_catches_nonexistent_target(sbo
   Q_url = sbox.repo_url + '/A/D/Q'
 
   # Copy dir A/D/G to A/D/Q
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp', G_path, Q_path)
+  svntest.actions.run_and_verify_svn(None, [], 'cp', G_path, Q_path)
 
   svntest.main.file_append(newfile_path, 'This is newfile.\n')
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', newfile_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', newfile_path)
 
   # Add newfile to dir G, creating r2.
   expected_output = wc.State(wc_dir, {
@@ -284,21 +284,21 @@ def merge_tree_deleted_in_target(sbox):
 
 
   # Copy B to I, creating r1.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', B_url, I_url, '-m', 'rev 2')
 
   # Change some files, creating r2.
   svntest.main.file_append(alpha_path, 'A change to alpha.\n')
   svntest.main.file_append(os.path.join(B_path, 'lambda'), 'change lambda.\n')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'rev 3', B_path)
 
   # Remove E, creating r3.
   E_url = sbox.repo_url + '/A/I/E'
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', E_url, '-m', 'rev 4')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', os.path.join(wc_dir,'A'))
 
   expected_output = wc.State(I_path, {
@@ -354,7 +354,7 @@ def three_way_merge_add_of_existing_bina
   # Create a branch of A, creating revision 2.
   A_url = sbox.repo_url + "/A"
   branch_A_url = sbox.repo_url + "/copy-of-A"
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "cp",
                                      A_url, branch_A_url,
                                      "-m", "Creating copy-of-A")
@@ -447,16 +447,16 @@ def merge_added_dir_to_deleted_in_target
   I_path = os.path.join(wc_dir, 'A', 'I')
 
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', B_url, I_url, '-m', 'rev 2')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', F_url, '-m', 'rev 3')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', '-m', 'rev 4', J_url)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                       'up', os.path.join(wc_dir,'A'))
 
   expected_output = wc.State(I_path, {
@@ -583,7 +583,7 @@ def mergeinfo_recording_in_skipped_merge
                                         wc_status, None, wc_dir)
 
   # Delete A_COPY/B/E
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm',
+  svntest.actions.run_and_verify_svn(None, [], 'rm',
                                      A_COPY_B_E_path)
 
   # Merge /A to /A_COPY ie., r1 to r4
@@ -673,7 +673,7 @@ def del_differing_file(sbox):
   target = 'A/D/G2'
   svn_copy(s_rev_orig, source, target)
   svntest.main.file_append(target+"/tau", "An extra line in the target.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      'newprop', 'v', target+"/pi")
 
   dir_D = os.path.join('A','D')
@@ -693,7 +693,7 @@ def del_differing_file(sbox):
   target = 'A/D/G3'
   svn_copy(s_rev_orig, source, target)
   svntest.main.file_append(target+"/tau", "An extra line in the target.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      'newprop', 'v', target+"/pi")
   sbox.simple_commit(target)
 
@@ -728,18 +728,18 @@ def tree_conflicts_and_obstructions(sbox
   br_alpha_moved = os.path.join(branch_path, 'alpha-moved')
 
   # Create a branch
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+  svntest.actions.run_and_verify_svn(None, [], 'cp',
                                      trunk_url,
                                      sbox.repo_url + '/branch',
                                      '-m', "Creating the Branch")
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'mv',
+  svntest.actions.run_and_verify_svn(None, [], 'mv',
                                      trunk_url + '/alpha',
                                      trunk_url + '/alpha-moved',
                                      '-m', "Move alpha to alpha-moved")
 
   # Update to revision 2.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'update', wc_dir)
 
   svntest.main.file_write(br_alpha_moved, "I am blocking myself from trunk\n")
@@ -1461,7 +1461,7 @@ def merge_replace_setup(sbox):
     'Committed revision 2.\n',
   ]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', url_A,
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'cp', url_A,
     url_branch, '-m', 'copy log')
 
   # svn up
@@ -1551,7 +1551,7 @@ def merge_replace_setup(sbox):
     'D         ' + branch_D_H + '\n',
   ])
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'delete',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'delete',
     branch_mu, branch_B_E, branch_D_G_pi, branch_D_H)
 
   # svn ci
@@ -1589,33 +1589,33 @@ def merge_replace_setup(sbox):
   # svn add branch/mu
   expected_stdout = ['A         ' + branch_mu + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'add',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'add',
     branch_mu)
 
   # dir-with-dir
   # svn mkdir branch/B/E
   expected_stdout = ['A         ' + branch_B_E + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
     branch_B_E)
 
   # svn ps propname propval branch/B/E
   expected_stdout = ["property 'propname' set on '" + branch_B_E + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'propname', 'propval', branch_B_E)
 
   # file-with-dir
   # svn mkdir branch/D/G/pi
   expected_stdout = ['A         ' + branch_D_G_pi + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
     branch_D_G_pi)
 
   # svn ps propname propval branch/D/G/pi
   expected_stdout = ["property 'propname' set on '" + branch_D_G_pi + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'propname', 'propval', branch_D_G_pi)
 
   # dir-with-file
@@ -1625,7 +1625,7 @@ def merge_replace_setup(sbox):
   # svn add branch/D/H
   expected_stdout = ['A         ' + branch_D_H + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'add',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'add',
     branch_D_H)
 
   # svn ci
@@ -1686,7 +1686,7 @@ def merge_replace_causes_tree_conflict(s
   # svn ps propname otherpropval A/B/E
   expected_stdout = ["property 'propname' set on '" + A_B_E + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'propname', 'otherpropval', A_B_E)
 
   # echo modified > A/D/G/pi
@@ -1695,7 +1695,7 @@ def merge_replace_causes_tree_conflict(s
   # svn ps propname propval A/D/H
   expected_stdout = ["property 'propname' set on '" + A_D_H + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'propname', 'propval', A_D_H)
 
   # svn merge $URL/A $URL/branch A
@@ -1709,7 +1709,7 @@ def merge_replace_causes_tree_conflict(s
     ' U   ' + A + '\n',
   ], target=A, two_url=True, tree_conflicts=4)
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
     url_A, url_branch, A)
 
   # svn st
@@ -1775,7 +1775,7 @@ def merge_replace_causes_tree_conflict2(
     'D         ' + os.path.join(A_D_H, 'psi') + '\n',
     'D         ' + A_D_H + '\n',
   ])
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'delete',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'delete',
     A_mu, A_B_E, A_D_G_pi, A_D_H)
   expected_status.tweak('A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/D/G/pi',
                         'A/D/H', 'A/D/H/chi', 'A/D/H/omega', 'A/D/H/psi',
@@ -1795,7 +1795,7 @@ def merge_replace_causes_tree_conflict2(
     " U   " + A_mu + "\n",  # mergeinfo -> 'RM' status
   ], target=A, two_url=True, tree_conflicts=1)
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
     url_A, url_branch, A, '--depth=files')
   # New mergeinfo describing the merge.
   expected_status.tweak('A', status=' M')
@@ -1815,7 +1815,7 @@ def merge_replace_causes_tree_conflict2(
     " U   " + A_B + "\n",     # mergeinfo
   ], target=A_B, two_url=True, tree_conflicts=1)
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
     url_A_B, url_branch_B, A_B)
   # New mergeinfo describing the merge.
   expected_status.tweak('A/B', status=' M')
@@ -1835,7 +1835,7 @@ def merge_replace_causes_tree_conflict2(
     " U   " + A_D + "\n",     # mergeinfo
   ], target=A_D, two_url=True, tree_conflicts=1)
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
     '--depth=immediates', url_A_D, url_branch_D, A_D)
   # New mergeinfo describing the merge.
   expected_status.tweak('A/D', 'A/D/G', status=' M')
@@ -1855,7 +1855,7 @@ def merge_replace_causes_tree_conflict2(
     " U   " + A_D_G + "\n",     # mergeinfo
   ], target=A_D_G, two_url=True, tree_conflicts=1)
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
     url_A_D_G, url_branch_D_G, A_D_G)
   # New mergeinfo describing the merge.
   expected_status.tweak('A/D/G', status=' M')
@@ -1876,7 +1876,7 @@ def merge_replace_causes_tree_conflict2(
                     '|(      \>.*)'
   tree_conflicted_path = [A_B_E, A_mu, A_D_G_pi, A_D_H]
   for path in tree_conflicted_path:
-    actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'st',
+    actions.run_and_verify_svn2(expected_stdout, [], 0, 'st',
                               '--depth=empty', path)
 
 #----------------------------------------------------------------------
@@ -1894,25 +1894,25 @@ def merge_replace_on_del_fails(sbox):
   C_branch_path = os.path.join(wc_dir, 'branch', 'C')
 
   # r2 - Copy ^/A to ^/branch
-  svntest.actions.run_and_verify_svn(None, None, [], 'copy',
+  svntest.actions.run_and_verify_svn(None, [], 'copy',
                                      sbox.repo_url + '/A',
                                      sbox.repo_url + '/branch',
                                      '-m', 'Create a branch')
 
   # r3 - Replace A/C
-  svntest.actions.run_and_verify_svn(None, None, [], 'del', C_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', C_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'del', C_path)
+  svntest.actions.run_and_verify_svn(None, [], 'mkdir', C_path)
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Replace A/C', wc_dir)
 
   # r4 - Delete branch/C
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'del', C_branch_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'del', C_branch_path)
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Delete branch/C', wc_dir)
 
   # Sync merge ^/A to branch
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_stdout = expected_merge_output([[2,4]], [
     '   C ' + C_branch_path + '\n',  # merge
     ' U   ' + branch_path + '\n',    # mergeinfo
@@ -1946,7 +1946,7 @@ def merge_replace_on_del_fails(sbox):
   #   svn: E155010: The node 'C:\SVN\src-trunk\Debug\subversion\tests\
   #     cmdline\svn-test-work\working_copies\merge_tree_conflict_tests-24\
   #     branch\C' was not found.
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'merge',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
     sbox.repo_url + '/A', branch_path)
 
 ########################################################################

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/mergeinfo_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/mergeinfo_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/mergeinfo_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/mergeinfo_tests.py Mon Feb  9 16:46:16 2015
@@ -89,7 +89,7 @@ def mergeinfo(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'))
   svntest.actions.run_and_verify_mergeinfo(adjust_error_for_server_version(""),
@@ -183,14 +183,14 @@ def mergeinfo_on_unknown_url(sbox):
 
   # remove a path from the repo and commit.
   iota_path = os.path.join(wc_dir, 'iota')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', iota_path)
-  svntest.actions.run_and_verify_svn("", None, [],
+  svntest.actions.run_and_verify_svn(None, [], 'rm', iota_path)
+  svntest.actions.run_and_verify_svn(None, [],
                                      "ci", wc_dir, "-m", "log message")
 
   url = sbox.repo_url + "/iota"
   expected_err = adjust_error_for_server_version(".*File not found.*iota.*|"
                                                  ".*iota.*path not found.*")
-  svntest.actions.run_and_verify_svn("", None, expected_err,
+  svntest.actions.run_and_verify_svn(None, expected_err,
                                      "mergeinfo", "--show-revs", "eligible",
                                      url, wc_dir)
 
@@ -213,11 +213,10 @@ def non_inheritable_mergeinfo(sbox):
 
   # Update the WC, then merge r4 from A to A_COPY and r6 from A to A_COPY
   # at --depth empty and commit the merges as r7.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(6), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(6), [], 'up',
                                      wc_dir)
   expected_status.tweak(wc_rev=6)
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[4]],
                           ['U    ' + rho_COPY_path + '\n',
                            ' U   ' + A_COPY_path + '\n',]),
@@ -225,7 +224,6 @@ def non_inheritable_mergeinfo(sbox):
     sbox.repo_url + '/A',
     A_COPY_path)
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[6]], ' G   ' + A_COPY_path + '\n'),
     [], 'merge', '-c6',
     sbox.repo_url + '/A',
@@ -239,7 +237,7 @@ def non_inheritable_mergeinfo(sbox):
                                         expected_status, None, wc_dir)
 
   # Update the WC a last time to ensure full inheritance.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(7), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [], 'up',
                                      wc_dir)
 
   # Despite being non-inheritable, r6 should still show as merged to A_COPY
@@ -296,26 +294,25 @@ def recursive_mergeinfo(sbox):
   nu2_path        = os.path.join(wc_dir, "A2", "C", "nu2")
 
   # Rename A to A2 in r7.
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(6), [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(6), [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ren', A_path, A2_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir, '-m', 'rename A to A2')
 
   # Add the files A/B/F/nu and A/C/nu2 and commit them as r8.
   svntest.main.file_write(nu_path, "A new file.\n")
   svntest.main.file_write(nu2_path, "Another new file.\n")
   svntest.main.run_svn(None, "add", nu_path, nu2_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir, '-m', 'Add 2 new files')
 
   # Do several merges to create varied subtree mergeinfo
 
   # Merge r4 from A2 to A_COPY at depth empty
-  svntest.actions.run_and_verify_svn(None, exp_noop_up_out(8), [], 'up',
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(8), [], 'up',
                                      wc_dir)
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[4]], ' U   ' + A_COPY_path + '\n'),
     [], 'merge', '-c4', '--depth', 'empty',
     sbox.repo_url + '/A2',
@@ -323,7 +320,6 @@ def recursive_mergeinfo(sbox):
 
   # Merge r6 from A2/D/H to A_COPY/D/H
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[6]],
                           ['U    ' + omega_COPY_path + '\n',
                            ' G   ' + H_COPY_path + '\n']),
@@ -333,7 +329,6 @@ def recursive_mergeinfo(sbox):
 
   # Merge r5 from A2 to A_COPY
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[5]],
                           ['U    ' + beta_COPY_path + '\n',
                            ' G   ' + A_COPY_path + '\n',
@@ -347,7 +342,6 @@ def recursive_mergeinfo(sbox):
   # Reverse merge -r5 from A2/C to A_COPY/C leaving empty mergeinfo on
   # A_COPY/C.
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[-5]],
                           ' G   ' + C_COPY_path + '\n'),
     [], 'merge', '-c-5',
@@ -355,7 +349,6 @@ def recursive_mergeinfo(sbox):
 
   # Merge r8 from A2/B/F to A_COPY/B/F
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[8]],
                           ['A    ' + nu_COPY_path + '\n',
                            ' G   ' + F_COPY_path + '\n']),
@@ -364,9 +357,9 @@ def recursive_mergeinfo(sbox):
     F_COPY_path)
 
   # Commit everything this far as r9
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir, '-m', 'Many merges')
-  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)
 
   # Test svn mergeinfo -R / --depth infinity.
@@ -461,26 +454,24 @@ def mergeinfo_on_pegged_wc_path(sbox):
   #
   # r7 - Merge -c3,6 from A to A_COPY.
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[3],[6]],
                           ['U    ' + psi_COPY_path + '\n',
                            'U    ' + omega_COPY_path + '\n',
                            ' U   ' + A_COPY_path + '\n',
                            ' G   ' + A_COPY_path + '\n',]),
     [], 'merge', '-c3,6', sbox.repo_url + '/A', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir,
                                      '-m', 'Merge r3 and r6')
 
   # r8 - Merge -c5 from A to A_COPY.
   svntest.actions.run_and_verify_svn(
-    None,
     expected_merge_output([[5]],
                           ['U    ' + beta_COPY_path + '\n',
                            ' U   ' + A_COPY_path + '\n']),
     [], 'merge', '-c5', '--allow-mixed-revisions',
     sbox.repo_url + '/A', A_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', wc_dir,
                                      '-m', 'Merge r5')
 
@@ -574,19 +565,19 @@ def wc_target_inherits_mergeinfo_from_re
   #   Properties on 'A_COPY':
   #     svn:mergeinfo
   #       /A:7
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A/D/G/rho',
                                      rho_COPY_path, '-c5')
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A',
                                      A_COPY_path, '-c7')
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Cherrypicks to branch subtree and root',
                                      wc_dir)
 
   # Checkout a new wc rooted at ^/A_COPY/D.
   subtree_wc = sbox.add_wc_path('D_COPY')
-  svntest.actions.run_and_verify_svn(None, None, [], 'co',
+  svntest.actions.run_and_verify_svn(None, [], 'co',
                                      sbox.repo_url + '/A_COPY/D',
                                      subtree_wc)
 
@@ -622,10 +613,10 @@ def wc_target_inherits_mergeinfo_from_re
   # source.
   #
   # In r9 make a change that effects two branches:
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   svntest.main.file_write(gamma_2_path, "New content.\n")
   svntest.main.file_write(tau_path, "New content.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Make changes under both A and A_COPY_2',
                                      wc_dir)
 
@@ -640,10 +631,10 @@ def wc_target_inherits_mergeinfo_from_re
   #   Properties on 'A_COPY\D\G\rho':
   #     svn:mergeinfo
   #       /A/D/G/rho:5
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A_COPY_2',
                                      A_COPY_path, '-c9')
-  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 to A_COPY',
                                      wc_dir)
 
@@ -673,8 +664,8 @@ def wc_target_inherits_mergeinfo_from_re
       '--show-revs', 'merged', '-R')
 
   # Test while the target is the full WC and then with the subtree WC:
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', subtree_wc)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', subtree_wc)
 
   test_svn_mergeinfo_4_way(D_COPY_path)
   test_svn_mergeinfo_4_way(subtree_wc)
@@ -697,27 +688,27 @@ def natural_history_is_not_eligible_nor_
 
   # r7 - Add a new file A/C/nu
   svntest.main.file_write(nu_path, "This is the file 'nu'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', nu_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'add', nu_path)
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Add a file', wc_dir)
 
   # r8 - Sync merge ^/A to A_COPY
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], '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', 'Add a file', wc_dir)
 
   # r9 - Modify the file added in r7
   svntest.main.file_write(nu_path, "Modification to file 'nu'.\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Modify added file', wc_dir)
 
   # r10 - Merge ^/A/C/nu to A_COPY/C/nu, creating subtree mergeinfo.
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A/C/nu', nu_COPY_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Add a file', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # We've effectively merged everything from ^/A to A_COPY, check
   # that svn mergeinfo -R agrees.
@@ -758,13 +749,13 @@ def noninheritable_mergeinfo_not_always_
   svntest.main.run_svn(None, 'up', wc_dir)
 
   # r4 - Merge r3 from ^/A to branch at depth=empty.
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge',
+  svntest.actions.run_and_verify_svn(None, [], 'merge',
                                      sbox.repo_url + '/A', branch_path,
                                      '-c3', '--depth=empty')
   # Forcibly set non-inheritable mergeinfo to replicate the pre-1.8 behavior,
   # where prior to the fix for issue #4057, non-inheritable mergeinfo was
   # unconditionally set for merges with shallow operational depths.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', SVN_PROP_MERGEINFO,
                                      '/A:3*\n', branch_path)
   svntest.main.run_svn(None, 'commit', '-m', 'shallow merge', wc_dir)
@@ -791,8 +782,7 @@ def mergeinfo_local_move(sbox):
   wc_dir = sbox.wc_dir
 
   sbox.simple_move('A', 'A2')
-  svntest.actions.run_and_verify_svn(None,
-                                     None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mergeinfo', sbox.repo_url + '/A',
                                      sbox.ospath('A2'))
 

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/move_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/move_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/move_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/move_tests.py Mon Feb  9 16:46:16 2015
@@ -182,8 +182,7 @@ def move_file_test(sbox, source, dest, m
         resolve['disk'] = None
       if 'revert_paths' in resolve:
         revert_paths = resolve['revert_paths']
-      svntest.actions.run_and_verify_svn('Resolve modification to source of move',
-                                          resolve['output'], resolve['error'],
+      svntest.actions.run_and_verify_svn(resolve['output'], resolve['error'],
                                           'resolve', '--accept', resolve_accept,
                                           '-R', wc_dir)
 
@@ -904,7 +903,7 @@ def build_simple_file_move_func(sbox, so
   # Setup the move function
   def move_func(rev):
     # execute the move
-    svntest.actions.run_and_verify_svn(None, None, [], "move",
+    svntest.actions.run_and_verify_svn(None, [], "move",
                                        source_path, dest_path)
     if move_func.extra_mv_tests:
       mv_status = svntest.actions.get_virginal_state(wc_dir, rev)
@@ -1098,7 +1097,7 @@ def property_merge(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   sbox.simple_update()
-  svntest.actions.run_and_verify_svn("resolve failed", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'resolve',
                                      '--accept=mine-conflict',
                                      sbox.ospath('A/C'))
@@ -1209,7 +1208,7 @@ def move_missing(sbox):
 
   # This move currently fails halfway between adding the dest and
   # deleting the source
-  svntest.actions.run_and_verify_svn(None, None, expected_err,
+  svntest.actions.run_and_verify_svn(None, expected_err,
                                      'mv', sbox.ospath('A/D/G'),
                                            sbox.ospath('R'))
 
@@ -1241,13 +1240,13 @@ def move_missing(sbox):
 def nested_replaces(sbox):
   "nested replaces"
 
-  repo_dir, repo_url = sbox.add_repo_path('blank')
-  wc_dir = sbox.add_wc_path('blank')
-  svntest.main.create_repos(repo_dir)
-  ospath = lambda dirent: sbox.ospath(dirent, wc_dir)
+  sbox.build(create_wc=False, empty=True)
+  repo_url = sbox.repo_url
+  wc_dir = sbox.wc_dir
+  ospath = sbox.ospath
 
   ## r1: setup
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                            '-U', repo_url,
                            '-m', 'r1: create tree',
                            'mkdir', 'A', 'mkdir', 'A/B', 'mkdir', 'A/B/C',
@@ -1335,7 +1334,7 @@ def nested_replaces(sbox):
   ]) + [
     '^-', '^r2', '^-', '^Changed paths:',
   ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'log', '-qvr2', repo_url)
 
   ## Test updating to r1.
@@ -1417,7 +1416,7 @@ def move_many_update_delete(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # And now create a tree conflict
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', sbox.repo_url + '/B',
                                      '-m', '')
 
@@ -1450,7 +1449,7 @@ def move_many_update_add(sbox):
   #svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # And now create a tree conflict
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', sbox.repo_url + '/B/A/A/BB',
                                      '-m', '')
 
@@ -1481,7 +1480,7 @@ def move_many_update_add(sbox):
                                         wc_dir, '--accept', 'mine-conflict')
 
   # And another one
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', sbox.repo_url + '/C/A/A/BB',
                                      '-m', '')
 
@@ -1564,17 +1563,17 @@ def move_to_from_external(sbox):
   sbox.simple_propset('svn:externals', '^/A/D/G GG', '')
   sbox.simple_update()
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'move',
                                      sbox.ospath('GG/tau'),
                                      sbox.ospath('tau'))
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'move',
                                      sbox.ospath('iota'),
                                      sbox.ospath('GG/tau'))
                                      
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'Commit both',
                                      sbox.ospath(''),
                                      sbox.ospath('GG'))

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/patch_tests.py Mon Feb  9 16:46:16 2015
@@ -1079,9 +1079,9 @@ def patch_remove_empty_dirs(sbox):
   svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
 
   F_path = sbox.ospath('A/B/F')
-  svntest.actions.run_and_verify_svn("Deleting F failed", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', F_path)
-  svntest.actions.run_and_verify_svn("Update failed", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', wc_dir)
 
   # We should be able to handle one path beeing missing.
@@ -1673,7 +1673,7 @@ def patch_no_svn_eol_style(sbox):
                                            1) # dry-run
 
       expected_output = ["Reverted '" + mu_path + "'\n"]
-      svntest.actions.run_and_verify_svn(None, expected_output, [], 'revert', '-R', wc_dir)
+      svntest.actions.run_and_verify_svn(expected_output, [], 'revert', '-R', wc_dir)
 
 def patch_with_svn_eol_style(sbox):
   "patch target with svn:eol-style"
@@ -1788,7 +1788,7 @@ def patch_with_svn_eol_style(sbox):
                                            1) # dry-run
 
       expected_output = ["Reverted '" + mu_path + "'\n"]
-      svntest.actions.run_and_verify_svn(None, expected_output, [], 'revert', '-R', wc_dir)
+      svntest.actions.run_and_verify_svn(expected_output, [], 'revert', '-R', wc_dir)
 
 def patch_with_svn_eol_style_uncommitted(sbox):
   "patch target with uncommitted svn:eol-style"
@@ -1897,7 +1897,7 @@ def patch_with_svn_eol_style_uncommitted
                                            1) # dry-run
 
       expected_output = ["Reverted '" + mu_path + "'\n"]
-      svntest.actions.run_and_verify_svn(None, expected_output, [], 'revert', '-R', wc_dir)
+      svntest.actions.run_and_verify_svn(expected_output, [], 'revert', '-R', wc_dir)
 
 def patch_with_ignore_whitespace(sbox):
   "ignore whitespace when patching"
@@ -4229,7 +4229,7 @@ def patch_change_symlink_target(sbox):
     'U         %s\n' % sbox.ospath('link'),
   ]
 
-  svntest.actions.run_and_verify_svn(None, patch_output, [],
+  svntest.actions.run_and_verify_svn(patch_output, [],
                                      'patch', patch_file_path, wc_dir)
 
   # r3 - Store result
@@ -4248,7 +4248,7 @@ def patch_change_symlink_target(sbox):
   svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                         None, None, wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, patch_output, [],
+  svntest.actions.run_and_verify_svn(patch_output, [],
                                      'patch', patch_file_path, wc_dir)
 
   # TODO: when it passes, verify that the on-disk 'link' is correct ---
@@ -4357,7 +4357,7 @@ def patch_replace_dir_with_file_and_vv(s
     'A         %s\n' % sbox.ospath('iota'),
   ]
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'patch', patch_file_path, sbox.wc_dir)
 
 @Issue(4297)
@@ -4391,7 +4391,7 @@ def single_line_mismatch(sbox):
     '>         rejected hunk @@ -1,1 +1,1 @@\n',
   ] + svntest.main.summary_of_conflicts(text_conflicts=1)
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'patch', patch_file_path, wc_dir)
 
 @Issue(3644)
@@ -4442,7 +4442,7 @@ def patch_empty_file(sbox):
   ]
 
   # Current result: lf.txt patched ok, new created, empty succeeds with offset.
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'patch', patch_file_path, wc_dir)
 
   expected_disk = svntest.main.greek_state.copy()
@@ -4556,7 +4556,7 @@ def patch_apply_no_fuz(sbox):
   ]
 
   # Current result: lf.txt patched ok, new created, empty succeeds with offset.
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'patch', patch_path, wc_dir)
 
   if not filecmp.cmp(sbox.ospath('test.txt'), sbox.ospath('test_v2.txt')):

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/prop_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/prop_tests.py Mon Feb  9 16:46:16 2015
@@ -100,8 +100,7 @@ def make_local_props(sbox):
 
   # Edit without actually changing the property
   svntest.main.use_editor('identity')
-  svntest.actions.run_and_verify_svn(None,
-                                     "No changes to property 'editme' on '.*'",
+  svntest.actions.run_and_verify_svn("No changes to property 'editme' on '.*'",
                                      [],
                                      'propedit', 'editme',
                                      os.path.join(wc_dir, 'A', 'mu'))
@@ -550,51 +549,50 @@ def inappropriate_props(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # These should produce an error
-  svntest.actions.run_and_verify_svn('Illegal target',
-                                     None, svntest.verify.AnyOutput,
+  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
                                      'propset', 'svn:executable', 'on', A_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:keywords', 'LastChangedDate',
                                      A_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:eol-style', 'native', A_path)
 
-  svntest.actions.run_and_verify_svn('Invalid svn:eol-style', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:eol-style', 'invalid value',
                                      os.path.join(A_path, 'mu'))
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:mime-type', 'image/png', A_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:ignore', '*.o', iota_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:externals',
                                      'foo http://host.com/repos', iota_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:author', 'socrates', iota_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:log', 'log message', iota_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:date', 'Tue Jan 19 04:14:07 2038',
                                      iota_path)
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput, 'propset',
                                      'svn:original-date',
                                      'Thu Jan  1 01:00:00 1970', iota_path)
@@ -603,7 +601,7 @@ def inappropriate_props(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Recursive setting of inappropriate dir prop should work on files
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset', '-R',
+  svntest.actions.run_and_verify_svn(None, [], 'propset', '-R',
                                      'svn:executable', 'on', E_path)
 
   expected_status.tweak('A/B/E/alpha', 'A/B/E/beta', status=' M')
@@ -620,7 +618,7 @@ def inappropriate_props(sbox):
                        'propset', 'svn:mime-type', 'application/octet-stream',
                        sbox.ospath('binary'))
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput,
                                      'propset', 'svn:eol-style',
                                      'CRLF', path)
@@ -629,7 +627,7 @@ def inappropriate_props(sbox):
   svntest.main.file_append(path, "line1\rline2\n")
   sbox.simple_add('multi-eol')
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput,
                                      'propset', 'svn:eol-style',
                                      'LF', path)
@@ -638,7 +636,7 @@ def inappropriate_props(sbox):
   svntest.main.file_append(path, "line1\n\r")
   sbox.simple_add('backwards-eol')
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput,
                                      'propset', 'svn:eol-style',
                                      'native', path)
@@ -647,7 +645,7 @@ def inappropriate_props(sbox):
   svntest.main.file_append(path, "line1\r\n\r")
   sbox.simple_add('incomplete-eol')
 
-  svntest.actions.run_and_verify_svn('Illegal target', None,
+  svntest.actions.run_and_verify_svn(None,
                                      svntest.verify.AnyOutput,
                                      'propset', 'svn:eol-style',
                                      'CR', path)
@@ -657,25 +655,25 @@ def inappropriate_props(sbox):
 
   path = sbox.ospath('binary')
   svntest.main.file_append(path, "binary")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'CRLF',
                                      path)
 
   path = sbox.ospath('multi-eol')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'LF',
                                      path)
 
   path = sbox.ospath('backwards-eol')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'native',
                                      path)
 
   path = sbox.ospath('incomplete-eol')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'CR',
                                      path)
@@ -684,18 +682,18 @@ def inappropriate_props(sbox):
   path = sbox.ospath('A/D')
 
   # ...grammatically incorrect
-  svntest.actions.run_and_verify_svn('illegal grammar', None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200020: Pathname not terminated by ':'\n",
                                      'propset', SVN_PROP_MERGEINFO, '/trunk',
                                      path)
-  svntest.actions.run_and_verify_svn('illegal grammar', None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200022: Invalid revision number found "
                                       "parsing 'one'\n",
                                      'propset', SVN_PROP_MERGEINFO,
                                      '/trunk:one', path)
 
   # ...contain overlapping revision ranges of differing inheritability.
-  svntest.actions.run_and_verify_svn('overlapping ranges', None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200020: Unable to parse overlapping "
                                      "revision ranges '9-20\\*' and "
                                      "'18-22' with different "
@@ -703,7 +701,7 @@ def inappropriate_props(sbox):
                                      'propset', SVN_PROP_MERGEINFO,
                                      '/branch:5-7,9-20*,18-22', path)
 
-  svntest.actions.run_and_verify_svn('overlapping ranges', None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200020: Unable to parse overlapping "
                                      "revision ranges "
                                      "(('3' and '3\\*')|('3\\*' and '3')) "
@@ -714,21 +712,21 @@ def inappropriate_props(sbox):
 
   # ...contain revision ranges with start revisions greater than or
   #    equal to end revisions.
-  svntest.actions.run_and_verify_svn('range start >= range end', None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200020: Unable to parse reversed "
                                       "revision range '20-5'\n",
                                      'propset', SVN_PROP_MERGEINFO,
                                      '/featureX:4,20-5', path)
 
   # ...contain paths mapped to empty revision ranges
-  svntest.actions.run_and_verify_svn('empty ranges', None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200020: Mergeinfo for '/trunk' maps to "
                                       "an empty revision range\n",
                                      'propset', SVN_PROP_MERGEINFO,
                                      '/trunk:', path)
 
   # ...contain non-inheritable ranges when the target is a file.
-  svntest.actions.run_and_verify_svn('empty ranges', None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200020: Cannot set non-inheritable "
                                      "mergeinfo on a non-directory*",
                                      'propset', SVN_PROP_MERGEINFO,
@@ -814,41 +812,41 @@ def revprop_change(sbox):
   sbox.build()
 
   # First test the error when no revprop-change hook exists.
-  svntest.actions.run_and_verify_svn(None, None, '.*pre-revprop-change',
+  svntest.actions.run_and_verify_svn(None, '.*pre-revprop-change',
                                      'propset', '--revprop', '-r', '0',
                                      'cash-sound', 'cha-ching!', sbox.wc_dir)
 
   # Now test error output from revprop-change hook.
   svntest.actions.disable_revprop_changes(sbox.repo_dir)
-  svntest.actions.run_and_verify_svn(None, None, '.*pre-revprop-change.* 0 jrandom cash-sound A',
+  svntest.actions.run_and_verify_svn(None, '.*pre-revprop-change.* 0 jrandom cash-sound A',
                                      'propset', '--revprop', '-r', '0',
                                      'cash-sound', 'cha-ching!', sbox.wc_dir)
 
   # Create the revprop-change hook for this test
   svntest.actions.enable_revprop_changes(sbox.repo_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--revprop', '-r', '0',
                                      'cash-sound', 'cha-ching!', sbox.wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propget', '--revprop', '-r', '0',
                                      'cash-sound', sbox.wc_dir)
 
   # Now test that blocking the revprop delete.
   svntest.actions.disable_revprop_changes(sbox.repo_dir)
-  svntest.actions.run_and_verify_svn(None, None, '.*pre-revprop-change.* 0 jrandom cash-sound D',
+  svntest.actions.run_and_verify_svn(None, '.*pre-revprop-change.* 0 jrandom cash-sound D',
                                      'propdel', '--revprop', '-r', '0',
                                      'cash-sound', sbox.wc_dir)
 
   # Now test actually deleting the revprop.
   svntest.actions.enable_revprop_changes(sbox.repo_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propdel', '--revprop', '-r', '0',
                                      'cash-sound', sbox.wc_dir)
 
   # The property should have been deleted.
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
     '.*(E195011|E200017).*cash-sound.*',
     'propget', '--revprop', '-r', '0', 'cash-sound', sbox.wc_dir)
 
@@ -1116,7 +1114,7 @@ def recursive_base_wc_ops(sbox):
     })
   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, [],
                                      'propset', '-R', 'svn:keywords', 'Date',
                                      os.path.join(wc_dir, 'A', 'B'))
   expected_status.tweak('A/B/lambda', 'A/B/E/alpha', 'A/B/E/beta', status=' M')
@@ -1154,9 +1152,9 @@ def url_props_ops(sbox):
   sbox.simple_commit()
 
   # Test propget
-  svntest.actions.run_and_verify_svn(None, [ propval1 + '\n' ], [],
+  svntest.actions.run_and_verify_svn([ propval1 + '\n' ], [],
                                      'propget', prop1, iota_url)
-  svntest.actions.run_and_verify_svn(None, [ propval1 + '\n' ], [],
+  svntest.actions.run_and_verify_svn([ propval1 + '\n' ], [],
                                      'propget', prop1, A_url)
 
   # Test normal proplist
@@ -1192,15 +1190,14 @@ def url_props_ops(sbox):
                        'propedit', prop1, '-m', 'editlog', iota_url)
   svntest.main.run_svn(None,
                        'propedit', prop1, '-m', 'editlog', A_url)
-  svntest.actions.run_and_verify_svn(None, [ propval1 + '\n' ], [],
+  svntest.actions.run_and_verify_svn([ propval1 + '\n' ], [],
                                      'propget', prop1, iota_url)
-  svntest.actions.run_and_verify_svn(None, [ propval1 + '\n' ], [],
+  svntest.actions.run_and_verify_svn([ propval1 + '\n' ], [],
                                      'propget', prop1, A_url)
 
   # Edit without actually changing the property
   svntest.main.use_editor('identity')
-  svntest.actions.run_and_verify_svn(None,
-                                     "No changes to property '%s' on '.*'"
+  svntest.actions.run_and_verify_svn("No changes to property '%s' on '.*'"
                                        % prop1,
                                      [],
                                      'propedit', prop1, '-m', 'nocommit',
@@ -1228,20 +1225,20 @@ def removal_schedule_added_props(sbox):
   # create new fs file
   open(newfile_path, 'w').close()
   # Add it and set a property
-  svntest.actions.run_and_verify_svn(None, file_add_output, [], 'add', newfile_path)
-  svntest.actions.run_and_verify_svn(None, propset_output, [], 'propset',
+  svntest.actions.run_and_verify_svn(file_add_output, [], 'add', newfile_path)
+  svntest.actions.run_and_verify_svn(propset_output, [], 'propset',
                                      'newprop', 'newvalue', newfile_path)
-  svntest.actions.run_and_verify_svn(None, propls_output, [],
+  svntest.actions.run_and_verify_svn(propls_output, [],
                                      'proplist', '-v', newfile_path)
   # remove the file
-  svntest.actions.run_and_verify_svn(None, file_rm_output, [],
+  svntest.actions.run_and_verify_svn(file_rm_output, [],
                                      'rm', '--force', newfile_path)
   # recreate the file and add it again
   open(newfile_path, 'w').close()
-  svntest.actions.run_and_verify_svn(None, file_add_output, [], 'add', newfile_path)
+  svntest.actions.run_and_verify_svn(file_add_output, [], 'add', newfile_path)
 
   # Now there should be NO properties leftover...
-  svntest.actions.run_and_verify_svn(None, [], [],
+  svntest.actions.run_and_verify_svn([], [],
                                      'proplist', '-v', newfile_path)
 
 #----------------------------------------------------------------------
@@ -1444,23 +1441,23 @@ def invalid_propnames(sbox):
 
   expected_stdout = (".*Attempting to delete nonexistent property "
                      "'%s'.*" % (propname,))
-  svntest.actions.run_and_verify_svn(None, expected_stdout, [],
+  svntest.actions.run_and_verify_svn(expected_stdout, [],
                                      'propdel', propname)
   expected_stderr = (".*'%s' is not a valid Subversion"
                      ' property name' % (propname,))
-  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+  svntest.actions.run_and_verify_svn(None, expected_stderr,
                                      'propedit', propname)
-  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+  svntest.actions.run_and_verify_svn(None, expected_stderr,
                                      'propget', propname)
-  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+  svntest.actions.run_and_verify_svn(None, expected_stderr,
                                      'propset', propname, propval)
 
-  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+  svntest.actions.run_and_verify_svn(None, expected_stderr,
                                      'commit', '--with-revprop',
                                      '='.join([propname, propval]))
   # Now swap them: --with-revprop should accept propname as a property
   # value; no concept of validity there.
-  svntest.actions.run_and_verify_svn(None, [], [],
+  svntest.actions.run_and_verify_svn([], [],
                                      'commit', '--with-revprop',
                                      '='.join([propval, propname]))
 
@@ -1481,15 +1478,15 @@ def perms_on_symlink(sbox):
   saved_cwd = os.getcwd()
   os.chdir(sbox.wc_dir)
   try:
-    svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', 'newdir')
+    svntest.actions.run_and_verify_svn(None, [], 'mkdir', 'newdir')
     os.symlink('newdir', 'symlink')
-    svntest.actions.run_and_verify_svn(None, None, [], 'add', 'symlink')
+    svntest.actions.run_and_verify_svn(None, [], 'add', 'symlink')
     old_mode = os.stat('newdir')[stat.ST_MODE]
     # The only property on 'symlink' is svn:special, so attempting to remove
     # 'svn:executable' should result in an error
     expected_stdout = (".*Attempting to delete nonexistent property "
                        "'svn:executable'.*")
-    svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'propdel',
+    svntest.actions.run_and_verify_svn(expected_stdout, [], 'propdel',
                                      'svn:executable', 'symlink')
     new_mode = os.stat('newdir')[stat.ST_MODE]
     if not old_mode == new_mode:
@@ -1603,11 +1600,11 @@ def props_over_time(sbox):
           pget_expected = [ pget_expected + "\n" ]
         expected_err = [] if expected else '.*W200017: Property.*not found.*'
         if op_rev != 0:
-          svntest.actions.run_and_verify_svn(None, pget_expected, expected_err,
+          svntest.actions.run_and_verify_svn(pget_expected, expected_err,
                                              'propget', 'revision', peg_path,
                                              '-r', str(op_rev))
         else:
-          svntest.actions.run_and_verify_svn(None, pget_expected, expected_err,
+          svntest.actions.run_and_verify_svn(pget_expected, expected_err,
                                              'propget', 'revision', peg_path)
 
         ### Test 'svn proplist -v'
@@ -1620,11 +1617,11 @@ def props_over_time(sbox):
                              "    " + expected + "\n" ]
 
         if op_rev != 0:
-          svntest.actions.run_and_verify_svn(None, plist_expected, [],
+          svntest.actions.run_and_verify_svn(plist_expected, [],
                                              'proplist', '-v', peg_path,
                                              '-r', str(op_rev))
         else:
-          svntest.actions.run_and_verify_svn(None, plist_expected, [],
+          svntest.actions.run_and_verify_svn(plist_expected, [],
                                              'proplist', '-v', peg_path)
 
 
@@ -1641,7 +1638,7 @@ def invalid_propvalues(sbox):
   svntest.actions.enable_revprop_changes(repo_dir)
 
   expected_stderr = '.*unexpected property value.*|.*Bogus date.*'
-  svntest.actions.run_and_verify_svn(None, [], expected_stderr,
+  svntest.actions.run_and_verify_svn([], expected_stderr,
                                      'propset', '--revprop', '-r', '0',
                                      'svn:date', 'Sat May 10 12:12:31 2008',
                                      repo_url)
@@ -1673,7 +1670,7 @@ def same_replacement_props(sbox):
   expected_out = [ "Properties on '" + foo_url + "':\n",
                    "  someprop\n",
                    "    someval\n" ]
-  svntest.actions.run_and_verify_svn(None, expected_out, [],
+  svntest.actions.run_and_verify_svn(expected_out, [],
                                      'proplist', '-v', foo_url)
 
 def added_moved_file(sbox):
@@ -1715,7 +1712,7 @@ def delete_nonexistent_property(sbox):
 
   # Remove one property
   expected_stdout = ".*Attempting to delete nonexistent property 'yellow'.*"
-  svntest.actions.run_and_verify_svn(None, expected_stdout, [],
+  svntest.actions.run_and_verify_svn(expected_stdout, [],
                                      'propdel', 'yellow',
                                      os.path.join(wc_dir, 'A', 'D', 'G'))
 
@@ -1739,13 +1736,13 @@ def post_revprop_change_hook(sbox):
   # file/svn give SVN_ERR_REPOS_HOOK_FAILURE
   expected_error = 'svn: (E175008|E165001).*post-revprop-change hook failed'
 
-  svntest.actions.run_and_verify_svn(None, [], expected_error,
+  svntest.actions.run_and_verify_svn([], expected_error,
                                      'ps', '--revprop', '-r0', 'p', 'v',
                                      wc_dir)
 
   # Verify change has stuck -- at one time mod_dav_svn would rollback
   # revprop changes on post-revprop-change hook errors
-  svntest.actions.run_and_verify_svn(None, 'v', [],
+  svntest.actions.run_and_verify_svn('v', [],
                                      'pg', '--revprop', '-r0', 'p',
                                      wc_dir)
 
@@ -1781,7 +1778,7 @@ def rm_of_replaced_file(sbox):
   svntest.main.run_svn(None, 'rm', '--force', mu_path)
 
   svntest.actions.run_and_verify_svn(
-                        None, [],
+                        [],
                         'svn: E200009.*some targets are not versioned.*',
                         'proplist', '-v', mu_path)
 
@@ -2053,7 +2050,7 @@ def atomic_over_ra(sbox):
 
   # Initial state.
   svntest.actions.enable_revprop_changes(sbox.repo_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--revprop', '-r', '0',
                                      'flower', s1, repo_url)
 
@@ -2064,7 +2061,7 @@ def atomic_over_ra(sbox):
     # so we should fail.
     expected_stderr = ".*doesn't advertise.*ATOMIC_REVPROP"
     svntest.actions.run_and_verify_atomic_ra_revprop_change(
-       None, None, expected_stderr, 1, repo_url, 0, 'flower',
+       None, expected_stderr, 1, repo_url, 0, 'flower',
        old_value, proposed_value, True)
 
     # The original value is still there.
@@ -2073,7 +2070,7 @@ def atomic_over_ra(sbox):
   def FAILS_WITH_BPV(not_the_old_value, proposed_value):
     if svntest.main.server_has_atomic_revprop():
       svntest.actions.run_and_verify_atomic_ra_revprop_change(
-         None, None, [], 0, repo_url, 0, 'flower',
+         None, [], 0, repo_url, 0, 'flower',
          not_the_old_value, proposed_value, True)
     else:
       expect_old_server_fail(not_the_old_value, proposed_value)
@@ -2081,7 +2078,7 @@ def atomic_over_ra(sbox):
   def PASSES_WITHOUT_BPV(yes_the_old_value, proposed_value):
     if svntest.main.server_has_atomic_revprop():
       svntest.actions.run_and_verify_atomic_ra_revprop_change(
-         None, None, [], 0, repo_url, 0, 'flower',
+         None, [], 0, repo_url, 0, 'flower',
          yes_the_old_value, proposed_value, False)
     else:
       expect_old_server_fail(yes_the_old_value, proposed_value)
@@ -2252,16 +2249,16 @@ def propget_redirection(sbox):
   # Set the 'big' mergeinfo prop on A/B, A/C, and A/D.
   svntest.main.file_write(prop_val_file, big_prop_val)
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      SVN_PROP_MERGEINFO, '-F', prop_val_file,
                                      B_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      SVN_PROP_MERGEINFO, '-F', prop_val_file,
                                      C_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      SVN_PROP_MERGEINFO, '-F', prop_val_file,
                                      D_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'ps some large svn:mergeinfos', wc_dir)
 
   # Run propget -vR svn:mergeinfo, redirecting the stdout to a file.
@@ -2305,7 +2302,7 @@ def file_matching_dir_prop_reject(sbox):
 
   # Add file with awkward name
   svntest.main.file_append(sbox.ospath('A/dir_conflicts'), "some content\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'add', sbox.ospath('A/dir_conflicts'))
   sbox.simple_propset('prop', 'val1', 'A/dir_conflicts')
   sbox.simple_propset('prop', 'val1', 'A')
@@ -2364,7 +2361,7 @@ def file_matching_dir_prop_reject(sbox):
     raise svntest.verify.SVNUnexpectedOutput
 
   # Revert and update to check that conflict files are removed
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', '-R', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir)
   expected_status.tweak('A', 'A/dir_conflicts', status='  ')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
@@ -2392,13 +2389,13 @@ def pristine_props_listed(sbox):
   expected_output = ["Properties on '" + sbox.ospath('A') + "':\n", "  prop\n"]
 
   # Now we see the pristine properties
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'proplist', '-R', wc_dir, '-r', 'BASE')
 
   sbox.simple_propset('prop', 'needs-fix', 'A')
 
   # And now we see no property at all
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'proplist', '-R', wc_dir, '-r', 'BASE')
 
 def create_inherited_ignores_config(config_dir):
@@ -2476,7 +2473,7 @@ def inheritable_ignores(sbox):
     ['?       ' + X_dir_path + '\n',
      '?       ' + Y_dir_path + '\n',
      '?       ' + Z_dir_path + '\n',])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'st',
+  svntest.actions.run_and_verify_svn(expected_output, [], 'st',
                                      '--config-dir', config_dir, wc_dir)
 
   # Check status without the custom config.
@@ -2488,7 +2485,7 @@ def inheritable_ignores(sbox):
      '?       ' + Z_dir_path    + '\n',
      '?       ' + boo_dir_path  + '\n',
      '?       ' + goo_file_path + '\n',])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'st', wc_dir)
+  svntest.actions.run_and_verify_svn(expected_output, [], 'st', wc_dir)
 
   # Check status with the custom config and --no-ignore.
   expected_output = svntest.verify.UnorderedOutput(
@@ -2503,7 +2500,7 @@ def inheritable_ignores(sbox):
      'I       ' + goo_file_path  + '\n',
      'I       ' + moo_file_path  + '\n',
      'I       ' + foo_file_path  + '\n',])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'st',
+  svntest.actions.run_and_verify_svn(expected_output, [], 'st',
                                      '--config-dir', config_dir,
                                      '--no-ignore', wc_dir)
 
@@ -2522,7 +2519,7 @@ def inheritable_ignores(sbox):
      '?       ' + goo_file_path  + '\n',
      'I       ' + moo_file_path  + '\n',
      'I       ' + foo_file_path  + '\n',])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'st',
+  svntest.actions.run_and_verify_svn(expected_output, [], 'st',
                                      '--no-ignore', wc_dir)
 
   # Perform the add with the --force flag, targeting the root of the WC.
@@ -2537,14 +2534,14 @@ def inheritable_ignores(sbox):
     ['A         ' + 'ADD-ME-DIR-X\n',
      'A         ' + os.path.join('A', 'ADD-ME-DIR-Y.doo') + '\n',
      'A         ' + os.path.join('A', 'D', 'G', 'ADD-ME-DIR-Z.doo') + '\n'])
-  svntest.actions.run_and_verify_svn("Adds in spite of ignores", expected,
+  svntest.actions.run_and_verify_svn(expected,
                                      [], 'add', '.', '--force',
                                      '--config-dir', config_dir)
   os.chdir(saved_wd)
 
   # Now revert and try the add with the --no-ignore flag, nothing should
   # be ignored.
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', wc_dir, '-R')
+  svntest.actions.run_and_verify_svn(None, [], 'revert', wc_dir, '-R')
   saved_wd = os.getcwd()
   os.chdir(sbox.wc_dir)
   expected = svntest.verify.UnorderedOutput(
@@ -2567,8 +2564,7 @@ def inheritable_ignores(sbox):
                                  'ignore-me-file.roo') + '\n',
      'A         ' + os.path.join('A', 'D', 'IGNORE-ME-DIR.moo') + '\n',
      'A         ' + os.path.join('A', 'D', 'ignore-me-file.moo') + '\n'])
-  svntest.actions.run_and_verify_svn("Files ignored with --no-ignore",
-                                     expected, [], 'add', '.', '--force',
+  svntest.actions.run_and_verify_svn(expected, [], 'add', '.', '--force',
                                      '--no-ignore', '--config-dir',
                                      config_dir)
 
@@ -2614,12 +2610,11 @@ def peg_rev_base_working(sbox):
   svntest.actions.set_prop('ordinal', 'ninth\n', sbox.ospath('iota'))
   sbox.simple_commit(message='r2')
   svntest.actions.set_prop('cardinal', 'nine\n', sbox.ospath('iota'))
-  svntest.actions.run_and_verify_svn(None, ['ninth\n'], [],
+  svntest.actions.run_and_verify_svn(['ninth\n'], [],
                                      'propget', '--strict', 'ordinal',
                                      sbox.ospath('iota') + '@BASE')
 
 @Issue(4415)
-@XFail(svntest.main.is_ra_type_dav)
 def xml_unsafe_author(sbox):
   "svn:author with XML unsafe chars"
 
@@ -2629,7 +2624,7 @@ def xml_unsafe_author(sbox):
   svntest.actions.enable_revprop_changes(sbox.repo_dir)
 
   # client sends svn:author (via PROPPATCH for DAV)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--revprop', '-r', '1',
                                      'svn:author', 'foo\bbar', wc_dir)
 
@@ -2646,22 +2641,70 @@ def xml_unsafe_author(sbox):
 
   # mod_dav_svn sends svn:author (via PROPFIND for DAV)
   # Since r1553367 this works correctly on ra_serf, since we now request
-  # a single property value which somehow triggers different behavior
-  svntest.actions.run_and_verify_svn(None, ['foo\bbar'], [],
+  # a single property value which skips creating the creator-displayname property
+  svntest.actions.run_and_verify_svn(['foo\bbar'], [],
                                      'propget', '--revprop', '-r', '1',
                                      'svn:author', '--strict', wc_dir)
 
+  # Ensure a stable date
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'propset', '--revprop', '-r', '1',
+                                     'svn:date', '2015-01-01T00:00:00.0Z', wc_dir)
+
   # But a proplist of this property value still fails via DAV.
-  expected_output = [
+  expected_output = svntest.verify.UnorderedOutput([
     'Unversioned properties on revision 1:\n',
     '  svn:author\n',
+    '    foo\bbar\n',
     '  svn:date\n',
-    '  svn:log\n'
-  ]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
-                                     'proplist', '--revprop', '-r', '1',
+    '    2015-01-01T00:00:00.0Z\n',
+    '  svn:log\n',
+    '    Log message for revision 1.\n'
+  ])
+  svntest.actions.run_and_verify_svn(expected_output, [],
+                                     'proplist', '--revprop', '-r', '1', '-v',
                                      wc_dir)
 
+@Issue(4415)
+def xml_unsafe_author2(sbox):
+  "svn:author with XML unsafe chars 2"
+
+  sbox.build(create_wc = False)
+  repo_url = sbox.repo_url
+
+  svntest.actions.enable_revprop_changes(sbox.repo_dir)
+
+  # client sends svn:author (via PROPPATCH for DAV)
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'propset', '--revprop', '-r', '1',
+                                     'svn:author', 'foo\bbar', repo_url)
+
+  # Ensure a stable date
+  svntest.actions.run_and_verify_svn(None, [],
+                                     'propset', '--revprop', '-r', '1',
+                                     'svn:date', '2000-01-01T12:00:00.0Z',
+                                     repo_url)
+
+  if svntest.main.is_ra_type_dav():
+    # This receives the filtered author (but that is better than an Xml fail)
+    expected_author = 'foobar'
+  else:
+    expected_author = 'foo\bbar'
+
+  expected_output = svntest.verify.UnorderedOutput([
+    '      1 %-8s              Jan 01  2000 ./\n' % expected_author,
+    '      1 %-8s              Jan 01  2000 A/\n' % expected_author,
+    '      1 %-8s           25 Jan 01  2000 iota\n' % expected_author
+  ])
+  svntest.actions.run_and_verify_svn(expected_output, [],
+                                     'ls', '-v', repo_url)
+
+  expected_info = [{
+      'Repository Root' : sbox.repo_url,
+      'Last Changed Author' : expected_author,
+  }]
+  svntest.actions.run_and_verify_info(expected_info, repo_url)
+
 def dir_prop_conflict_details(sbox):
   "verify dir property conflict details"
 
@@ -2720,7 +2763,7 @@ def iprops_list_abspath(sbox):
   sbox.simple_propset('im', 'root', '')
   sbox.simple_commit()
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'switch', '^/A/D', sbox.ospath(''),
                                      '--ignore-ancestry')
 
@@ -2735,7 +2778,7 @@ def iprops_list_abspath(sbox):
     '  im\n',
     '    GammA\n'
   ]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'pl', '-R',
                                      '--show-inherited-props', '-v',
                                      sbox.ospath(''))
@@ -2749,7 +2792,7 @@ def iprops_list_abspath(sbox):
     '  im\n',
     '    GammA\n'
   ]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'pl', '-R',
                                      '--show-inherited-props', '-v',
                                      os.path.abspath(sbox.ospath('')))
@@ -2759,11 +2802,11 @@ def wc_propop_on_url(sbox):
 
   sbox.build(create_wc = False)
 
-  svntest.actions.run_and_verify_svn(None, None, '.*E195000:.*path',
+  svntest.actions.run_and_verify_svn(None, '.*E195000:.*path',
                                      'pl', '-r', 'PREV',
                                      sbox.repo_url)
 
-  svntest.actions.run_and_verify_svn(None, None, '.*E195000:.*path',
+  svntest.actions.run_and_verify_svn(None, '.*E195000:.*path',
                                      'pg', 'my:Q', '-r', 'PREV',
                                      sbox.repo_url)
 
@@ -2814,6 +2857,7 @@ test_list = [ None,
               almost_known_prop_names,
               peg_rev_base_working,
               xml_unsafe_author,
+              xml_unsafe_author2,
               dir_prop_conflict_details,
               iprops_list_abspath,
               wc_propop_on_url,

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/redirect_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/redirect_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/redirect_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/redirect_tests.py Mon Feb  9 16:46:16 2015
@@ -205,6 +205,42 @@ def redirected_externals(sbox):
   verify_url(sbox.ospath('A/C/dirX'), sbox.repo_url + '/A/B/F')
 
 #----------------------------------------------------------------------
+@SkipUnless(svntest.main.is_ra_type_dav)
+def redirected_copy(sbox):
+  "redirected copy"
+
+  sbox.build(create_wc=False)
+
+  # E170011 = SVN_ERR_RA_SESSION_URL_MISMATCH
+  expected_error = "svn: E170011: Repository moved permanently"
+
+  # This tests the actual copy handling
+  svntest.actions.run_and_verify_svn(None, expected_error,
+                                     'cp', '-m', 'failed copy',
+                                     sbox.redirected_root_url() + '/A',
+                                     sbox.redirected_root_url() + '/A_copied')
+
+  # This tests the cmdline handling of '^/copy-of-A'
+  svntest.actions.run_and_verify_svn(None, expected_error,
+                                     'cp', '-m', 'failed copy',
+                                     sbox.redirected_root_url() + '/A',
+                                     '^/copy-of-A')
+
+  # E170011 = SVN_ERR_RA_SESSION_URL_MISMATCH
+  expected_error = "svn: E170011: Repository moved temporarily"
+
+  # This tests the actual copy handling
+  svntest.actions.run_and_verify_svn(None, expected_error,
+                                     'cp', '-m', 'failed copy',
+                                     sbox.redirected_root_url(temporary=True) + '/A',
+                                     sbox.redirected_root_url(temporary=True) + '/A_copied')
+
+  # This tests the cmdline handling of '^/copy-of-A'
+  svntest.actions.run_and_verify_svn(None, expected_error,
+                                     'cp', '-m', 'failed copy',
+                                     sbox.redirected_root_url(temporary=True) + '/A',
+                                     '^/copy-of-A')
+#----------------------------------------------------------------------
 
 ########################################################################
 # Run the tests
@@ -216,6 +252,7 @@ test_list = [ None,
               redirected_update,
               redirected_nonroot_update,
               redirected_externals,
+              redirected_copy,
              ]
 
 if __name__ == '__main__':

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/relocate_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/relocate_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/relocate_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/relocate_tests.py Mon Feb  9 16:46:16 2015
@@ -53,7 +53,7 @@ def relocate_deleted_missing_copied(sbox
 
   # Delete A/mu to create a deleted entry for mu in A/.svn/entries
   mu_path = os.path.join(wc_dir, 'A', 'mu')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', mu_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', mu_path)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.remove('A/mu')
   expected_output = svntest.wc.State(wc_dir, {
@@ -70,11 +70,11 @@ def relocate_deleted_missing_copied(sbox
   # Copy A/D to A/D2
   D_path = os.path.join(wc_dir, 'A', 'D')
   D2_path = os.path.join(wc_dir, 'A', 'D2')
-  svntest.actions.run_and_verify_svn(None, None, [], 'copy',
+  svntest.actions.run_and_verify_svn(None, [], 'copy',
                                      D_path, D2_path)
   # Delete within the copy
   D2G_path = os.path.join(wc_dir, 'A', 'D2', 'G')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', D2G_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', D2G_path)
 
   expected_status.add({
     'A/D2'         : Item(status='A ', wc_rev='-', copied='+'),
@@ -97,7 +97,7 @@ def relocate_deleted_missing_copied(sbox
   other_repo_dir, other_repo_url = sbox.add_repo_path('other')
   svntest.main.copy_repos(repo_dir, other_repo_dir, 2, 0)
   svntest.main.safe_rmtree(repo_dir, 1)
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
+  svntest.actions.run_and_verify_svn(None, [], 'switch', '--relocate',
                                      repo_url, other_repo_url, wc_dir)
 
   # Deleted and missing entries should be preserved, so update should
@@ -163,26 +163,26 @@ def relocate_beyond_repos_root(sbox):
   other_B_url = other_repo_url + "/B"
 
   svntest.main.safe_rmtree(wc_dir, 1)
-  svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+  svntest.actions.run_and_verify_svn(None, [], 'checkout',
                                      repo_url + '/A', wc_dir)
 
   svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 0)
 
   # A relocate that changes the repo path part of the URL shouldn't work.
   # This tests for issue #2380.
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
                                      ".*Invalid relocation destination.*",
                                      'relocate',
                                      A_url, other_B_url, A_wc_dir)
 
   # Another way of trying to change the fs path, leading to an invalid
   # repository root.
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
                                      ".*is not the root.*",
                                      'relocate',
                                      repo_url, other_B_url, A_wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'relocate',
                                      A_url, other_A_url, A_wc_dir)
 
@@ -217,8 +217,7 @@ def relocate_and_propset(sbox):
 
   # checkout
   svntest.main.safe_rmtree(wc_dir, 1)
-  svntest.actions.run_and_verify_svn(None,
-                                     None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -226,7 +225,7 @@ def relocate_and_propset(sbox):
   other_repo_dir, other_repo_url = sbox.add_repo_path('other')
   svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 0)
   svntest.main.safe_rmtree(repo_dir, 1)
-  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+  svntest.actions.run_and_verify_svn(None, [], 'relocate',
                                      repo_url, other_repo_url, wc_dir)
 
   # Remove gamma from the working copy.
@@ -281,8 +280,7 @@ def single_file_relocate(sbox):
 
   # checkout
   svntest.main.safe_rmtree(wc_dir, 1)
-  svntest.actions.run_and_verify_svn(None,
-                                     None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -291,7 +289,7 @@ def single_file_relocate(sbox):
   other_iota_url = other_repo_url + '/iota'
   svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 0)
   svntest.main.safe_rmtree(repo_dir, 1)
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
                                      ".*Cannot relocate.*",
                                      'relocate',
                                      iota_url, other_iota_url, iota_path)
@@ -314,7 +312,7 @@ def relocate_with_switched_children(sbox
   svntest.main.safe_rmtree(repo_dir, 1)
 
   # Do the switch and check the results in three ways.
-  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+  svntest.actions.run_and_verify_svn(None, [], 'relocate',
                                      repo_url, other_repo_url, wc_dir)
 
   # Attempt to commit changes and examine results
@@ -361,7 +359,7 @@ def relocate_with_relative_externals(sbo
   # Add a relative external.
   change_external(os.path.join(wc_dir, 'A', 'B'),
                   "^/A/D/G G-ext\n../D/H H-ext", commit=True)
-  svntest.actions.run_and_verify_svn(None, None, [], 'update', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'update', wc_dir)
 
   # Move our repository to another location.
   repo_dir = sbox.repo_dir
@@ -371,7 +369,7 @@ def relocate_with_relative_externals(sbo
   svntest.main.safe_rmtree(repo_dir, 1)
 
   # Now relocate our working copy.
-  svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+  svntest.actions.run_and_verify_svn(None, [], 'relocate',
                                      repo_url, other_repo_url, wc_dir)
 
   # Check the URLs of the externals -- were they updated to point to the



Mime
View raw message