subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1659291 [9/21] - in /subversion/branches/remove-log-addressing: ./ subversion/include/ subversion/include/private/ subversion/libsvn_delta/ subversion/libsvn_fs_base/ subversion/libsvn_fs_fs/ subversion/libsvn_fs_x/ subversion/libsvn_repos...
Date Thu, 12 Feb 2015 15:50:48 GMT
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/depth_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/depth_tests.py?rev=1659291&r1=1659290&r2=1659291&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/depth_tests.py Thu
Feb 12 15:50:47 2015
@@ -73,7 +73,6 @@ def set_up_depthy_working_copies(sbox, e
     wc_empty = sbox.wc_dir + '-depth-empty'
     sbox.add_test_path(wc_empty, True)
     svntest.actions.run_and_verify_svn(
-      "Unexpected error from co --depth=empty",
       svntest.verify.AnyOutput, [],
       "co", "--depth", "empty", sbox.repo_url, wc_empty)
 
@@ -82,7 +81,6 @@ def set_up_depthy_working_copies(sbox, e
     wc_files = sbox.wc_dir + '-depth-files'
     sbox.add_test_path(wc_files, True)
     svntest.actions.run_and_verify_svn(
-      "Unexpected error from co --depth=files",
       svntest.verify.AnyOutput, [],
       "co", "--depth", "files", sbox.repo_url, wc_files)
 
@@ -91,7 +89,6 @@ def set_up_depthy_working_copies(sbox, e
     wc_immediates = sbox.wc_dir + '-depth-immediates'
     sbox.add_test_path(wc_immediates, True)
     svntest.actions.run_and_verify_svn(
-      "Unexpected error from co --depth=immediates",
       svntest.verify.AnyOutput, [],
       "co", "--depth", "immediates",
       sbox.repo_url, wc_immediates)
@@ -102,7 +99,7 @@ def verify_depth(msg, depth, path="."):
   """Verifies that PATH has depth DEPTH.  MSG is the failure message."""
   if depth == "infinity":
     # Check for absence of depth line.
-    exit_code, out, err = svntest.actions.run_and_verify_svn(None, None,
+    exit_code, out, err = svntest.actions.run_and_verify_svn(None,
                                                              [], "info", path)
     for line in out:
       if line.startswith("Depth:"):
@@ -111,7 +108,7 @@ def verify_depth(msg, depth, path="."):
     expected_stdout = svntest.verify.ExpectedOutput("Depth: %s\n" % depth,
                                                     match_all=False)
     svntest.actions.run_and_verify_svn(
-      msg, expected_stdout, [], "info", path)
+      expected_stdout, [], "info", path)
 
 #----------------------------------------------------------------------
 # Ensure that 'checkout --depth=empty' results in a depth-empty working copy.
@@ -144,8 +141,7 @@ def depth_files_same_as_nonrecursive(sbo
   if os.path.exists(sbox.wc_dir):
     svntest.main.safe_rmtree(sbox.wc_dir)
 
-  svntest.actions.run_and_verify_svn("Unexpected error during co %s" % opt,
-                                     svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      "co", opt, sbox.repo_url, sbox.wc_dir)
 
   # Should create a depth-files top directory, so both iota and A
@@ -275,7 +271,7 @@ def depth_empty_commit(sbox):
   wc_empty_iota = os.path.join(wc_empty, 'iota')
 
   # Update 'iota' in the depth-empty working copy and modify it
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', wc_empty_iota)
   svntest.main.file_write(wc_empty_iota, "iota modified")
 
@@ -310,7 +306,7 @@ def depth_empty_with_file(sbox):
   ### minutes of trying to figure out how, I decided to compromise.
 
   # Update iota by name, expecting to receive it.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', iota_path)
+  svntest.actions.run_and_verify_svn(None, [], 'up', iota_path)
 
   # Test that we did receive it.
   if not os.path.exists(iota_path):
@@ -329,7 +325,7 @@ def depth_empty_with_file(sbox):
 
   # Delete iota in the "other" wc.
   other_iota_path = os.path.join(wc, 'iota')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', other_iota_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', other_iota_path)
   expected_output = svntest.wc.State(wc, { 'iota' : Item(verb='Deleting'), })
   expected_status = svntest.actions.get_virginal_state(wc, 1)
   expected_status.remove('iota')
@@ -442,7 +438,7 @@ def depth_empty_with_dir(sbox):
 
   # Commit the deletion of A/mu from the "other" wc.
   svntest.main.file_write(other_mu_path, "new text\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', other_mu_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', other_mu_path)
   expected_output = svntest.wc.State(wc, { 'A/mu' : Item(verb='Deleting'), })
   expected_status = svntest.actions.get_virginal_state(wc, 1)
   expected_status.remove('A/mu')
@@ -504,8 +500,7 @@ def depth_immediates_bring_in_file(sbox)
                                         A_mu_path)
 
   # Run 'svn up A/D/gamma' to test the edge case 'Skipped'.
-  svntest.actions.run_and_verify_svn("update A/D/gamma",
-                       ["Skipped '"+gamma_path+"'\n", ],
+  svntest.actions.run_and_verify_svn(["Skipped '"+gamma_path+"'\n", ],
                        "svn: E155007: ", 'update', gamma_path)
   svntest.actions.run_and_verify_status(wc_imm, expected_status)
 
@@ -648,7 +643,7 @@ def depth_empty_unreceive_delete(sbox):
   iota_path = os.path.join(wc, 'iota')
 
   # Commit in the "other" wc.
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', iota_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', iota_path)
   expected_output = svntest.wc.State(wc, { 'iota' : Item(verb='Deleting'), })
   expected_status = svntest.actions.get_virginal_state(wc, 1)
   expected_status.remove('iota')
@@ -682,7 +677,7 @@ def depth_immediates_unreceive_delete(sb
   mu_path = os.path.join(wc, 'A', 'mu')
 
   # Commit in the "other" wc.
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', mu_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', mu_path)
   expected_output = svntest.wc.State(wc, { 'A/mu' : Item(verb='Deleting'), })
   expected_status = svntest.actions.get_virginal_state(wc, 1)
   expected_status.remove('A/mu')
@@ -722,7 +717,7 @@ def depth_immediates_receive_delete(sbox
   A_path = os.path.join(wc, 'A')
 
   # Commit in the "other" wc.
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', A_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', A_path)
   expected_output = svntest.wc.State(wc, { 'A' : Item(verb='Deleting'), })
   expected_status = svntest.wc.State(wc, {
     '' : Item(status='  ', wc_rev=1),
@@ -759,7 +754,7 @@ def depth_immediates_subdir_propset_1(sb
   A_path = os.path.join(wc_immediates, 'A')
 
   # Set a property on an immediate subdirectory of the working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'pset', 'foo', 'bar',
                                      A_path)
 
@@ -813,16 +808,15 @@ def depth_immediates_subdir_propset_2(sb
   A_path = sbox.ospath('A')
 
   # Set a property on an immediate subdirectory of the working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'pset', 'foo', 'bar',
                                      A_path)
   # Commit.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', 'logmsg', A_path)
 
   # Update at depth=immediates in the other wc, expecting to see no errors.
-  svntest.actions.run_and_verify_svn("Output on stderr where none expected",
-                                     svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'update', '--depth', 'immediates',
                                      other_wc)
 
@@ -953,13 +947,13 @@ def commit_propmods_with_depth_empty_hel
   chi_path = os.path.join(H_path, 'chi')
 
   # Set some properties, modify some files.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'foo-val', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'bar', 'bar-val', D_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'baz', 'baz-val', G_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'qux', 'qux-val', H_path)
   svntest.main.file_append(iota_path, "new iota\n")
   svntest.main.file_append(gamma_path, "new gamma\n")
@@ -1016,14 +1010,14 @@ def diff_in_depthy_wc(sbox):
   gamma_path = os.path.join(wc, 'A', 'D', 'gamma')
 
   # Make some changes in the depth-infinity wc, and commit them
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'foo-val', wc)
   svntest.main.file_write(iota_path, "new text\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'bar', 'bar-val', A_path)
   svntest.main.file_write(mu_path, "new text\n")
   svntest.main.file_write(gamma_path, "new text\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', '', wc)
 
   from svntest.verify import make_diff_header, make_diff_prop_header, \
@@ -1047,48 +1041,48 @@ def diff_in_depthy_wc(sbox):
 
   expected_output = svntest.verify.UnorderedOutput(diff_dot)
   # The diff should contain only the propchange on '.'
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', '-rHEAD')
 
   # Upgrade to depth-files.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--set-depth', 'files', '-r1')
   # The diff should contain only the propchange on '.' and the
   # contents change on iota.
   expected_output = svntest.verify.UnorderedOutput(diff_iota + diff_dot)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', '-rHEAD')
   # Do a diff at --depth empty.
   expected_output = svntest.verify.UnorderedOutput(diff_dot)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', '--depth', 'empty', '-rHEAD')
 
   # Upgrade to depth-immediates.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--set-depth', 'immediates', '-r1')
   # The diff should contain the propchanges on '.' and 'A' and the
   # contents change on iota.
   expected_output = svntest.verify.UnorderedOutput(diff_A + diff_iota +
                                                    diff_dot)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                     'diff', '-rHEAD')
   # Do a diff at --depth files.
   expected_output = svntest.verify.UnorderedOutput(diff_iota + diff_dot)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', '--depth', 'files', '-rHEAD')
 
   # Upgrade A to depth-files.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--set-depth', 'files', '-r1', 'A')
   # The diff should contain everything but the contents change on
   # gamma (which does not exist in this working copy).
   expected_output = svntest.verify.UnorderedOutput(diff_mu + diff_A +
                                                    diff_iota + diff_dot)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff', '-rHEAD')
   # Do a diff at --depth immediates.
   expected_output = svntest.verify.UnorderedOutput(diff_A + diff_iota +                 
                                                              diff_dot)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                     'diff', '--depth', 'immediates', '-rHEAD')
 
 @Issue(2882)
@@ -1177,7 +1171,7 @@ def depth_immediates_receive_new_dir(sbo
   svntest.main.file_write(zeta_path, "This is the file 'zeta'.\n")
 
   # Commit in the "other" wc.
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', I_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', I_path)
   expected_output = svntest.wc.State(wc, {
     'I'      : Item(verb='Adding'),
     'I/zeta' : Item(verb='Adding'),
@@ -1230,20 +1224,20 @@ def add_tree_with_depth(sbox):
   os.mkdir(new3_path)
   os.mkdir(new4_path)
   # Simple case, add new1 only, set depth to files
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "add", "--depth", "files", new1_path)
   verify_depth(None, "infinity", new1_path)
 
   # Force add new1 at new1 again, should include new2 at empty, the depth of
   # new1 should not change
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "add", "--depth", "immediates",
                                      "--force", new1_path)
   verify_depth(None, "infinity", new1_path)
   verify_depth(None, "infinity", new2_path)
 
   # add new4 with intermediate path, the intermediate path is added at empty
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      "add", "--depth", "immediates",
                                      "--parents", new4_path)
   verify_depth(None, "infinity", new3_path)
@@ -1325,14 +1319,14 @@ def status_in_depthy_wc(sbox):
   gamma_path = os.path.join(wc, 'A', 'D', 'gamma')
 
   # Make some changes in the depth-infinity wc, and commit them
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'foo-val', wc)
   svntest.main.file_write(iota_path, "new text\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'bar', 'bar-val', A_path)
   svntest.main.file_write(mu_path, "new text\n")
   svntest.main.file_write(gamma_path, "new text\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', '', wc)
 
   status = [
@@ -1347,44 +1341,44 @@ def status_in_depthy_wc(sbox):
 
   expected_output = svntest.verify.UnorderedOutput(status[:2])
   # The output should contain only the change on '.'.
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'st', '-u')
 
   # Upgrade to depth-files.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--set-depth', 'files', '-r1')
   # The output should contain only the changes on '.' and 'iota'.
   expected_output = svntest.verify.UnorderedOutput(status[:3])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'st', '-u')
   # Do a status -u at --depth empty.
   expected_output = svntest.verify.UnorderedOutput(status[:2])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'st', '-u', '--depth', 'empty')
 
   # Upgrade to depth-immediates.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--set-depth', 'immediates', '-r1')
   # The output should contain the changes on '.', 'A' and 'iota'.
   expected_output = svntest.verify.UnorderedOutput(status[:4])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                     'st', '-u')
   # Do a status -u at --depth files.
   expected_output = svntest.verify.UnorderedOutput(status[:3])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'st', '-u', '--depth', 'files')
 
   # Upgrade A to depth-files.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--set-depth', 'files', '-r1', 'A')
   # The output should contain everything but the change on
   # gamma (which does not exist in this working copy).
   expected_output = svntest.verify.UnorderedOutput(status)
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'st', '-u')
   # Do a status -u at --depth immediates.
   expected_output = svntest.verify.UnorderedOutput(status[:4])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                     'st', '-u', '--depth', 'immediates')
 
 #----------------------------------------------------------------------
@@ -1402,7 +1396,7 @@ def depthy_update_above_dir_to_be_delete
     }
 
   exit_code, output, err = svntest.actions.run_and_verify_svn(
-    None, None, [],
+    None, [],
     "delete", "-m", "Delete A.", sbox.repo_url + "/A")
 
   def empty_output(wc_dir):
@@ -1678,13 +1672,13 @@ def depth_folding_clean_trees_2(sbox):
   G_path = os.path.join(D_path, 'G')
 
   # pull in directory A at immediates
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--depth', 'immediates', A_path)
   # check to see if it's really at immediates
   verify_depth(None, "immediates", A_path)
 
   # pull in directory D at infinity
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'infinity', D_path)
 
   # Run 'svn up --set-depth=immediates' to directory A/D.
@@ -1751,7 +1745,7 @@ def depth_folding_clean_trees_2(sbox):
   verify_depth(None, "empty", D_path)
 
   # pull in directory D at infinity
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'infinity', D_path)
 
   # Run 'svn up --set-depth=immediates' to directory A.
@@ -1772,7 +1766,7 @@ def depth_folding_clean_trees_2(sbox):
   verify_depth(None, "empty", D_path)
 
   # pull in directory D at files
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'files', D_path)
 
   # Run 'svn up --set-depth=immediates' to directory A.
@@ -1828,12 +1822,12 @@ def depth_fold_expand_clean_trees(sbox):
   D_path = os.path.join(A_path, 'D')
 
   # pull in directory A at empty
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--depth', 'empty', A_path)
   verify_depth(None, "empty", A_path)
 
   # pull in directory D at infinity
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', D_path)
 
   # Make the other working copy.
@@ -2084,7 +2078,7 @@ def excluded_path_update_operation(sbox)
   verify_depth(None, "immediates", B_path)
 
   # Exclude A/B/E again
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'exclude', E_path)
 
   # Exclude path B totally, in which contains an excluded subtree.
@@ -2183,7 +2177,7 @@ def excluded_path_misc_operation(sbox):
 
   # copy A/B to A/L, excluded entry should be copied too
   expected_output = ['A         '+L_path+'\n']
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'cp', B_path, L_path)
   # verify_depth exclude? not implemented yet
   #verify_depth(None, "empty", LE_path)
@@ -2194,16 +2188,16 @@ def excluded_path_misc_operation(sbox):
   expected_output = svntest.verify.UnorderedOutput([
     "Reverted '%s'\n" % path for path in revert_paths])
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', '--depth=infinity', L_path)
 
   # copy A/B to A/L and then cp A/L to A/M, excluded entry should be
   # copied both times
   expected_output = ['A         '+L_path+'\n']
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'cp', B_path, L_path)
   expected_output = ['A         '+M_path+'\n']
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'cp', L_path, M_path)
 
   # commit this copy, with an excluded item.
@@ -2231,17 +2225,17 @@ def excluded_path_misc_operation(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)
 
   # remove the new directory A/L, with an excluded item.
   # If successed, no error will be thrown
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', L_path)
 
   # revert the delete
   # If successed, no error will be thrown
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', '--depth=infinity', L_path)
 
 
@@ -2273,7 +2267,7 @@ def excluded_receive_remote_removal(sbox
                                         "--set-depth", "exclude", B_path)
 
   # Remove path B in the repos.
-  svntest.actions.run_and_verify_svn(None, None, [], "delete", "-m",
+  svntest.actions.run_and_verify_svn(None, [], "delete", "-m",
                                      "Delete B.", sbox.repo_url + "/A/B")
 
   # Update wc, should receive the removal of excluded path B
@@ -2292,7 +2286,7 @@ def excluded_receive_remote_removal(sbox
   # This should succeed if the exclude entry is gone with the update,
   # otherwise a name conflict will rise up.
   expected_output = ['A         '+B_path+'\n']
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'cp', C_path, B_path)
 
 
@@ -2312,7 +2306,7 @@ def exclude_keeps_hidden_entries(sbox):
   # we could grep the 'entries' file, but...
   # or we could use 'info', but info_excluded() is XFail.
   expected_stderr = ".*svn: E150002: '.*C' is already under version control.*"
-  svntest.actions.run_and_verify_svn(None, None, expected_stderr,
+  svntest.actions.run_and_verify_svn(None, expected_stderr,
                                      'mkdir', 'C')
 
 
@@ -2368,7 +2362,7 @@ def make_depth_tree_conflicts(sbox):
   g =      j(D, 'gamma')
 
   # Store node modifications as rev 2
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'foo-val', B)
   svntest.main.file_append(m, "Modified mu.\n")
   svntest.main.file_append(g, "Modified gamma.\n")
@@ -2406,7 +2400,7 @@ def make_depth_tree_conflicts(sbox):
 
   # Perform node deletions so that items become unversioned and
   # will have tree-conflicts upon update.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', m, B, g)
 
   # Update so that conflicts appear
@@ -2554,7 +2548,7 @@ def update_excluded_path_sticky_depths(s
   svntest.actions.run_and_verify_info([expected_info], B_path)
 
   # Exclude A/B again
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'exclude', B_path)
 
   # Update to depth 'files' for the excluded path A/B
@@ -2587,7 +2581,7 @@ def update_excluded_path_sticky_depths(s
   svntest.actions.run_and_verify_info([expected_info], B_path)
 
   # Exclude A/B again
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'exclude', B_path)
 
   # Update to depth 'immediates' for the excluded path A/B
@@ -2626,7 +2620,7 @@ def update_excluded_path_sticky_depths(s
   svntest.actions.run_and_verify_info([expected_info], B_path)
 
   # Exclude A/B again
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'exclude', B_path)
 
   # Update to depth 'infinity' for the excluded path A/B
@@ -2666,7 +2660,7 @@ def update_depth_empty_root_of_infinite_
   A_path = os.path.join(wc_dir, 'A')
 
   # Update A to depth 'infinity'
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'infinity', A_path)
 
   # Tweak some files in the full working copy and commit.
@@ -2674,7 +2668,7 @@ def update_depth_empty_root_of_infinite_
                            "Modified alpha.\n")
   svntest.main.file_append(os.path.join(wc_other, 'A', 'D', 'G', 'rho'),
                            "Modified rho.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', '', wc_other)
 
   # Now update the original working copy and make sure we get those changes.
@@ -2706,7 +2700,6 @@ def sparse_update_with_dash_dash_parents
 
   # Start with a depth=empty root checkout.
   svntest.actions.run_and_verify_svn(
-      "Unexpected error from co --depth=empty",
       svntest.verify.AnyOutput, [],
       "co", "--depth", "empty", sbox.repo_url, sbox.wc_dir)
 
@@ -2796,7 +2789,7 @@ def update_below_depth_empty(sbox):
                                         False,
                                         '--set-depth', 'empty', A)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', repo_url + '/iota',
                                            repo_url + '/A/B',
                                      '-m', 'remote copy')
@@ -2860,7 +2853,7 @@ def revert_depth_files(sbox):
 
   sbox.simple_rm('A/mu')
   # Expect reversion of just 'mu'
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', '--depth=immediates', sbox.ospath('A'))
 
   # Apply an unrelated directory delete
@@ -2868,7 +2861,7 @@ def revert_depth_files(sbox):
 
   sbox.simple_rm('A/mu')
   # Expect reversion of just 'mu'
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', '--depth=files', sbox.ospath('A'))
 
 @Issue(4257)



Mime
View raw message