subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1658462 [19/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/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/externals_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/externals_tests.py Mon Feb  9 16:46:16 2015
@@ -115,7 +115,7 @@ def externals_test_setup(sbox):
   D_path = os.path.join(wc_init_dir, "A/D")
 
   # Create a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_init_dir)
 
@@ -123,22 +123,22 @@ def externals_test_setup(sbox):
   # post-commit status checks.
 
   svntest.main.file_append(mu_path, "Added to mu in revision 2.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg',
                                      '--quiet', wc_init_dir)
 
   svntest.main.file_append(pi_path, "Added to pi in revision 3.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg',
                                      '--quiet', wc_init_dir)
 
   svntest.main.file_append(lambda_path, "Added to lambda in revision 4.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg',
                                      '--quiet', wc_init_dir)
 
   svntest.main.file_append(omega_path, "Added to omega in revision 5.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg',
                                      '--quiet', wc_init_dir)
 
@@ -217,7 +217,7 @@ def change_external(path, new_val, commi
 
   svntest.actions.set_prop('svn:externals', new_val, path)
   if commit:
-    svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+    svntest.actions.run_and_verify_svn(None, [], 'ci',
                                        '-m', 'log msg', '--quiet', path)
 
 def change_external_expect_error(path, new_val, expected_err):
@@ -269,7 +269,7 @@ def checkout_with_externals(sbox):
   repo_url       = sbox.repo_url
 
   # Create a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -310,11 +310,11 @@ def update_receive_new_external(sbox):
   other_repo_url = repo_url + ".other"
 
   # Checkout two working copies.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, other_wc_dir)
 
@@ -358,11 +358,11 @@ def update_lose_external(sbox):
   repo_url       = sbox.repo_url
 
   # Checkout two working copies.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, other_wc_dir)
 
@@ -433,11 +433,11 @@ def update_change_pristine_external(sbox
   other_repo_url = repo_url + ".other"
 
   # Checkout two working copies.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, other_wc_dir)
 
@@ -486,11 +486,11 @@ def update_change_modified_external(sbox
   other_repo_url = repo_url + ".other"
 
   # Checkout two working copies.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, other_wc_dir)
 
@@ -548,11 +548,11 @@ def update_receive_change_under_external
   other_repo_url = repo_url + ".other"
 
   # Checkout two working copies.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      other_repo_url, other_wc_dir)
 
@@ -629,7 +629,7 @@ def modify_and_update_receive_new_extern
   repo_url       = sbox.repo_url
 
   # Checkout a working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -651,8 +651,7 @@ def modify_and_update_receive_new_extern
 
   # Once upon a time there was a core-dump here
 
-  svntest.actions.run_and_verify_svn("update failed",
-                                     svntest.verify.AnyOutput, [], 'up' )
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], 'up' )
 
   os.chdir(was_cwd)
 
@@ -668,7 +667,7 @@ def disallow_dot_or_dotdot_directory_ref
   repo_url       = sbox.repo_url
 
   # Checkout a working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -739,7 +738,7 @@ def export_with_externals(sbox):
   repo_url       = sbox.repo_url
 
   # Create a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'export',
                                      repo_url, wc_dir)
 
@@ -786,11 +785,11 @@ def export_wc_with_externals(sbox):
   export_target = sbox.add_wc_path('export')
 
   # Create a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
   # Export the working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'export', wc_dir, export_target)
 
   ### We should be able to check exactly the paths that externals_test_setup()
@@ -815,7 +814,7 @@ def export_wc_with_externals(sbox):
   svntest.main.safe_rmtree(export_target)
 
   # Export it again, without externals.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'export', '--ignore-externals',
                                      wc_dir, export_target)
   probe_paths_missing(paths)
@@ -830,12 +829,12 @@ def external_with_peg_and_op_revision(sb
   repo_url       = sbox.repo_url
 
   # Checkout a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
   # remove A/D/H in the other repo
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm',
                                      external_url_for["A/D/exdir_A/H"],
                                      '-m', 'remove original A/D/H')
@@ -875,7 +874,7 @@ def new_style_externals(sbox):
   repo_url       = sbox.repo_url
 
   # Checkout a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -975,7 +974,7 @@ def old_style_externals_ignore_peg_reg(s
   repo_url       = sbox.repo_url
 
   # Checkout a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -998,8 +997,7 @@ def old_style_externals_ignore_peg_reg(s
   expected_error = "|".join([".*Error handling externals definition.*",
                              ".*URL .*/A/D/G@HEAD' .* doesn't exist.*",
                              ])
-  svntest.actions.run_and_verify_svn2("External '%s' used pegs" % ext.strip(),
-                                      None,
+  svntest.actions.run_and_verify_svn2(None,
                                       expected_error,
                                       1,
                                       'up',
@@ -1016,13 +1014,12 @@ def cannot_move_or_remove_file_externals
   repo_url       = sbox.repo_url
 
   # Checkout a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
   # Should not be able to delete the file external.
-  svntest.actions.run_and_verify_svn("Able to delete file external",
-                                     None,
+  svntest.actions.run_and_verify_svn(None,
                                      ".*Cannot remove the external at "
                                      ".*gamma.*; please .* "
                                      "the svn:externals .*",
@@ -1030,8 +1027,7 @@ def cannot_move_or_remove_file_externals
                                      sbox.ospath('A/B/gamma'))
 
   # Should not be able to move the file external.
-  svntest.actions.run_and_verify_svn("Able to move file external",
-                                     None,
+  svntest.actions.run_and_verify_svn(None,
                                      ".*Cannot move the external at "
                                      ".*gamma.*; please .*edit.*"
                                      "svn:externals.*",
@@ -1042,7 +1038,7 @@ def cannot_move_or_remove_file_externals
   # But the directory that contains it can be deleted.
   expected_status = svntest.actions.get_virginal_state(wc_dir, 6)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm',
                                      sbox.ospath('A/B'))
 
@@ -1126,7 +1122,7 @@ def cant_place_file_external_into_dir_ex
   other_repo_url = repo_url + ".other"
 
   # Checkout a working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -1138,7 +1134,7 @@ def cant_place_file_external_into_dir_ex
 
   # Bring the working copy up to date and check that the file the file
   # external is switched to still exists.
-  svntest.actions.run_and_verify_svn(None, None, 'svn: E205011: ' +
+  svntest.actions.run_and_verify_svn(None, 'svn: E205011: ' +
                                      'Failure occurred.*definitions',
                                      'up', wc_dir)
 
@@ -1301,7 +1297,7 @@ def update_lose_file_external(sbox):
                                         True)
 
   # now remove the svn:external prop
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propdel', 'svn:externals', C)
 
   # commit the property change
@@ -1370,15 +1366,15 @@ def switch_relative_external(sbox):
   })
   svntest.actions.run_and_verify_update(wc_dir,
                                         expected_output, None, None)
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+  svntest.actions.run_and_verify_svn(None, [], 'cp',
                                      '--quiet', A_path, A_copy_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg',
                                      '--quiet', wc_dir)
 
   # Okay.  We now want to switch A to A_copy, which *should* cause
   # A/D/ext to point to the URL for A_copy/B (instead of A/B).
-  svntest.actions.run_and_verify_svn(None, None, [], 'sw',
+  svntest.actions.run_and_verify_svn(None, [], 'sw',
                                      A_copy_url, A_path)
 
   expected_infos = [
@@ -1415,13 +1411,13 @@ def export_sparse_wc_with_externals(sbox
 
   # Create a working copy with depth=empty itself but children that are
   # depth=infinity.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout', '--depth=empty',
                                      repo_url, wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'update', *child_paths)
   # Export the working copy.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'export', wc_dir, export_target)
   # It failed with "'gamma' is not under version control" because the
   # depth-infinity children led it wrongly to try to process externals
@@ -1605,7 +1601,7 @@ def merge_target_with_externals(sbox):
   A_branch_path       = sbox.ospath('A-branch')
   A_gamma_branch_path = sbox.ospath('A-branch/D/gamma')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -1615,12 +1611,12 @@ def merge_target_with_externals(sbox):
   change_external(sbox.ospath('A'), externals_prop)
 
   # Branch A@1 to A-branch and make a simple text change on the latter in r8.
-  svntest.actions.run_and_verify_svn(None, None, [], 'copy', A_path + '@1',
+  svntest.actions.run_and_verify_svn(None, [], 'copy', A_path + '@1',
                                      A_branch_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'make a copy', wc_dir)
   svntest.main.file_write(A_gamma_branch_path, "The new gamma!\n")
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'branch edit', wc_dir)
   expected_output = svntest.wc.State(wc_dir, {
     'A/external'        : Item(status='A '),
@@ -1631,10 +1627,9 @@ def merge_target_with_externals(sbox):
 
   # Merge r8 from A-branch back to A.  There should be explicit mergeinfo
   # only at the root of A; the externals should not get any.
-  svntest.actions.run_and_verify_svn(None, None, [], 'merge', '-c8',
+  svntest.actions.run_and_verify_svn(None, [], 'merge', '-c8',
                                      repo_url + '/A-branch', A_path)
   svntest.actions.run_and_verify_svn(
-    "Unexpected subtree mergeinfo created",
     ["Properties on '" + A_path + "':\n",
      "  svn:mergeinfo\n",
      "    /A-branch:8\n"],
@@ -1710,7 +1705,7 @@ def update_external_on_locally_added_dir
   other_repo_url = repo_url + ".other"
 
   # Checkout a working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -1787,13 +1782,13 @@ def switch_external_on_locally_added_dir
 
   # Create a branch of A
   # Checkout a working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy',
                                      A_path, A_copy_path,
                                      '-m', 'Create branch of A')
 
   # Checkout a working copy
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      A_path, wc_dir)
 
@@ -1817,7 +1812,7 @@ def switch_external_on_locally_added_dir
   change_external(new_dir, new_externals_desc, commit=False)
 
   # Switch the working copy to the branch, see if we get the new item.
-  svntest.actions.run_and_verify_svn(None, None, [], 'sw', A_copy_path, wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'sw', A_copy_path, wc_dir)
 
   probe_paths_exist([sbox.ospath('foo/exdir_E')])
 
@@ -1835,8 +1830,7 @@ def file_external_in_sibling(sbox):
   sbox.simple_update()
 
   os.chdir(sbox.ospath("A"))
-  svntest.actions.run_and_verify_svn(None,
-                            svntest.actions.expected_noop_update_output(2),
+  svntest.actions.run_and_verify_svn(svntest.actions.expected_noop_update_output(2),
                             [], 'update')
 
 @Issue(3823)
@@ -1895,7 +1889,7 @@ def exclude_externals(sbox):
   repo_url       = sbox.repo_url
 
   # Checkout two working copies.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -2022,7 +2016,7 @@ def file_externals_different_url(sbox):
                                 os.path.join(sbox.wc_dir, e))
 
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'relocate', r1_url, r2_url, wc_dir)
 
 
@@ -2054,7 +2048,7 @@ def file_external_in_unversioned(sbox):
   svntest.actions.run_and_verify_update(wc_dir, expected_output, None, None)
 
   # At one point this failed with SVN_DEBUG wcng consistency checks enabled
-  svntest.actions.run_and_verify_svn(None, None, [], 'cleanup', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'cleanup', wc_dir)
 
 
 from svntest import verify, actions, main
@@ -2077,12 +2071,12 @@ def copy_file_externals(sbox):
   # svn mkdir X
   expected_stdout = ['A         ' + X + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir', X)
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir', X)
 
   # svn ps svn:externals "^/iota xiota" X
   expected_stdout = ["property 'svn:externals' set on '" + X + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'svn:externals', '''
     ^/iota xiota
     ^/A/mu xmu
@@ -2173,7 +2167,7 @@ def copy_file_externals(sbox):
   # svn cp X X_copy
   expected_stdout = ['A         ' + X_copy + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', X,
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'cp', X,
     X_copy)
 
   # svn ci
@@ -2260,7 +2254,7 @@ def commit_include_externals(sbox):
     'A         ' + Z_zeta + '\n',
   ])
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'add', Z)
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'add', Z)
 
   # svn mkdir --parents Xpegged X/Y
   expected_stdout = verify.UnorderedOutput([
@@ -2269,7 +2263,7 @@ def commit_include_externals(sbox):
     'A         ' + X_Y + '\n',
   ])
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
     '--parents', Xpegged, X_Y)
 
   # svn ci
@@ -2313,13 +2307,13 @@ def commit_include_externals(sbox):
   # svn ps svn:externals "^/Z xZ" A/D/H
   expected_stdout = ["property 'svn:externals' 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',
     'svn:externals', '^/Z xZ', A_D_H)
 
   # svn ps svn:externals "^/iota@1 Xpegged/xiota" wc_dir
   expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'svn:externals',
     '''
       ^/iota@1 Xpegged/xiota
@@ -2694,7 +2688,7 @@ def include_immediate_dir_externals(sbox
   # svn mkdir X
   expected_stdout = ['A         ' + X + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir', X)
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir', X)
 
   # svn ci
   expected_output = svntest.wc.State(wc_dir, {
@@ -2725,7 +2719,7 @@ def include_immediate_dir_externals(sbox
   # svn ps svn:externals "^/A/B/E X/XE" wc_dir
   expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'svn:externals', '^/A/B/E X/XE', wc_dir)
 
   # svn ci
@@ -2829,17 +2823,17 @@ def remap_file_external_with_prop_del(sb
   mu_path = sbox.ospath('A/mu')
 
   # Add a property to A/mu
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'propname', 'propval', mu_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', 'New property on 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)
 
   # Add a new file external A/external pointing to ^/A/mu
   externals_prop = "^/A/mu external\n"
   change_external(A_path, externals_prop)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # Change A/external to point to ^/iota
   externals_prop = "^/iota external\n"
@@ -2848,7 +2842,7 @@ def remap_file_external_with_prop_del(sb
   # Now update to bring the new external down.
   # This previously segfaulted as described in
   # http://subversion.tigris.org/issues/show_bug.cgi?id=4093#desc1
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
 
 # Test for issue #4053 'svn:externals with explicit rev checks out HEAD'
@@ -2891,7 +2885,7 @@ def dir_external_with_dash_r_only(sbox):
   # svn ps svn:externals ' -r1 ^/A/B/E E_ext' .
   expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'svn:externals', ' -r1 ^/A/B/E E_ext', wc_dir)
 
   # svn up
@@ -2934,12 +2928,12 @@ def url_to_wc_copy_of_externals(sbox):
   repo_url = sbox.repo_url
 
   # Create an external A/C/external pointing to ^/A/D/G.
-  svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+  svntest.actions.run_and_verify_svn(None, [], 'ps',
                                      'svn:externals', '^/A/D/G external',
                                      sbox.ospath('A/C'))
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'create an external', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # Copy ^/A/C to External-WC-to-URL-Copy.
   #
@@ -2988,7 +2982,7 @@ def url_to_wc_copy_of_externals(sbox):
     "A         " + external_root_path + "\n"
   ])
   exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
-    "OUTPUT", expected_stdout, [], 0, 'copy', repo_url + '/A/C',
+    expected_stdout, [], 0, 'copy', repo_url + '/A/C',
     sbox.ospath('External-WC-to-URL-Copy'))
 
 @Issue(4227)
@@ -3016,31 +3010,31 @@ def duplicate_targets(sbox):
     match_all=False)
 
   # svn ps svn:externals "^/A/B/E barf\n^/A/B/E barf" .
-  actions.run_and_verify_svn2('OUTPUT', [], expected_stderr, 1, 'ps',
+  actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
     'svn:externals', '^/A/B/E barf\n^/A/B/E barf', wc_dir)
 
   # svn ps svn:externals "^/A/B/E barf\n^/A/D/G barf" .
-  actions.run_and_verify_svn2('OUTPUT', [], expected_stderr, 1, 'ps',
+  actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
     'svn:externals', '^/A/B/E barf\n^/A/D/G barf', wc_dir)
 
   # svn ps svn:externals "^/A/B/E barf/.\n^/A/D/G ./barf" .
-  actions.run_and_verify_svn2('OUTPUT', [], expected_stderr, 1, 'ps',
+  actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
     'svn:externals', '^/A/B/E barf/.\n^/A/D/G ./barf', wc_dir)
 
   # svn ps svn:externals "^/A/B/E ././barf\n^/A/D/G .//barf" .
-  actions.run_and_verify_svn2('OUTPUT', [], expected_stderr, 1, 'ps',
+  actions.run_and_verify_svn2([], expected_stderr, 1, 'ps',
     'svn:externals', '^/A/B/E ././barf\n^/A/D/G .//barf', wc_dir)
 
   # svn pg svn:externals .
   expected_stderr = '.*W200017: Property.*not found'
 
-  actions.run_and_verify_svn2('OUTPUT', [], expected_stderr, 1, 'pg',
+  actions.run_and_verify_svn2([], expected_stderr, 1, 'pg',
     'svn:externals', wc_dir)
 
   # svn ps svn:externals "^/A/B/E ok" .
   expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'ps',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'ps',
     'svn:externals', '^/A/B/E ok', wc_dir)
 
   # svn pg svn:externals .
@@ -3049,7 +3043,7 @@ def duplicate_targets(sbox):
     '\n'
   ])
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'pg',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'pg',
     'svn:externals', wc_dir)
 
 @Issue(4225)
@@ -3061,7 +3055,7 @@ def list_include_externals(sbox):
   wc_dir         = sbox.wc_dir
   repo_url       = sbox.repo_url
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      repo_url, wc_dir)
 
@@ -3084,10 +3078,10 @@ def list_include_externals(sbox):
     "gamma" + "\n"])
 
   exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
-    "OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', B_path)
+    expected_stdout, [], 0, 'ls', '--include-externals', B_path)
 
   exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
-    "OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', B_url)
+    expected_stdout, [], 0, 'ls', '--include-externals', B_url)
 
   expected_stdout = verify.UnorderedOutput([
     list_external_string("exdir_G", C_url)+ "\n",
@@ -3100,10 +3094,10 @@ def list_include_externals(sbox):
     "psi" + "\n"])
 
   exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
-    "OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', C_path)
+    expected_stdout, [], 0, 'ls', '--include-externals', C_path)
 
   exit_code, stdout, stderr = svntest.actions.run_and_verify_svn2(
-    "OUTPUT", expected_stdout, [], 0, 'ls', '--include-externals', C_url)
+    expected_stdout, [], 0, 'ls', '--include-externals', C_url)
 
 @Issue(4293)
 def move_with_file_externals(sbox):
@@ -3141,7 +3135,7 @@ def pinned_externals(sbox):
     '^      1 jrandom            .* mu$'
   )
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'list', repo_X_mu, '-v')
 
   # So, we copied A/mu to X/mu in r2, but its last changed revision is
@@ -3248,7 +3242,7 @@ def switch_parent_relative_file_external
   # Check out A/B_copy to a new working copy
   branch_wc = sbox.add_wc_path("branch")
   branch_url = sbox.repo_url + '/A_copy'
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout', branch_url,
                                      branch_wc)
 
@@ -3258,12 +3252,12 @@ def switch_parent_relative_file_external
 
   # Switch the branch working copy to the new branch URL
   new_branch_url = sbox.repo_url + '/A_copy2'
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'switch', new_branch_url,
                                      branch_wc)
 
   # Bug: The branch working copy can no longer be updated.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'update', branch_wc)
 
 @Issue(4420)
@@ -3274,7 +3268,7 @@ def file_external_unversioned_obstructio
   wc_dir = sbox.wc_dir
 
   expected_output = verify.RegexOutput('r2 committed .*')
-  svntest.actions.run_and_verify_svnmucc(None, expected_output, [],
+  svntest.actions.run_and_verify_svnmucc(expected_output, [],
                            '-U', sbox.repo_url, '-m', 'r2: set external',
                            'propset', 'svn:externals', '^/A/mu mu-ext', 'A')
 
@@ -3307,7 +3301,7 @@ def file_external_versioned_obstruction(
   wc_dir = sbox.wc_dir
 
   expected_output = verify.RegexOutput('r2 committed .*')
-  svntest.actions.run_and_verify_svnmucc(None, expected_output, [],
+  svntest.actions.run_and_verify_svnmucc(expected_output, [],
                            '-U', sbox.repo_url, '-m', 'r2: set external',
                            'propset', 'svn:externals', '^/A/mu mu-ext', 'A')
 
@@ -3332,7 +3326,7 @@ def file_external_versioned_obstruction(
   # versioned node is missing from disk and wc.db.  Not really sure
   # what should happen, perhaps a not-present node?
   expected_output = verify.RegexOutput('r3 committed .*')
-  svntest.actions.run_and_verify_svnmucc(None, expected_output, [],
+  svntest.actions.run_and_verify_svnmucc(expected_output, [],
                            '-U', sbox.repo_url, '-m', 'r3: copy file',
                            'cp', 'head', 'A/mu', 'A/mu-ext',
                            'propdel', 'svn:externals', 'A')
@@ -3411,7 +3405,7 @@ def update_external_peg_rev(sbox):
     "Performing status on external item at '%s':\n" % sbox.ospath('A/B/F/xE'),
     "Status against revision:      2\n",
   ]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'status', '-u', sbox.wc_dir)
 
 def update_deletes_file_external(sbox):
@@ -3425,7 +3419,7 @@ def update_deletes_file_external(sbox):
   sbox.simple_update()
 
   # Create a branch
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy',
                                      '-m', 'create branch',
                                      sbox.repo_url + '/A',
@@ -3435,7 +3429,7 @@ def update_deletes_file_external(sbox):
   sbox.simple_update()
 
   # Remove the branch
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm',
                                      '-m', 'remove branch',
                                      sbox.repo_url + '/A_copy')
@@ -3451,7 +3445,7 @@ def switch_relative_externals(sbox):
 
   sbox.build(create_wc=False)
 
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                                          '-U', sbox.repo_url, '-m', 'Q',
                                          'mkdir', 'branches',
                                          'cp', '1', 'A', 'trunk',
@@ -3465,18 +3459,18 @@ def switch_relative_externals(sbox):
 
   wc = sbox.add_wc_path('wc')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'co', sbox.repo_url + '/trunk', wc)
 
   # This forgets to update some externals data
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'switch', sbox.repo_url + '/branches/A', wc)
 
   # This upgrade makes the following update fail
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'upgrade', wc)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', wc)
 
 
@@ -3489,7 +3483,7 @@ def copy_file_external_to_repo(sbox):
   change_external(sbox.ospath('A'), '^/A/mu ext')
   sbox.simple_update()
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp',
+  svntest.actions.run_and_verify_svn(None, [], 'cp',
                                      '--message', 'external copy',
                                      sbox.ospath('A/ext'),
                                      sbox.repo_url + '/ext_copy')
@@ -3547,6 +3541,43 @@ def replace_tree_with_foreign_external(s
                                         None, None, None, None, None, 1,
                                         '-r', '2', wc_dir)
 
+def nested_notification(sbox):
+  "notification for nested externals"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+  repo_dir = sbox.repo_dir
+
+  sbox.simple_mkdir('D1')
+  sbox.simple_mkdir('D2')
+  sbox.simple_mkdir('D3')
+  sbox.simple_mkdir('D4')
+  sbox.simple_propset('svn:externals', '^/D2 X', 'D1')
+  sbox.simple_propset('svn:externals', '^/D3 X', 'D2')
+  sbox.simple_propset('svn:externals', '^/D4 X', 'D3')
+  sbox.simple_commit()
+  expected_output = [
+    'Updating \'' + sbox.ospath('D1') + '\':\n',
+    '\n',
+    'Fetching external item into \'' + sbox.ospath('D1/X') + '\':\n',
+    ' U   ' + sbox.ospath('D1/X') + '\n',
+    '\n',
+    'Fetching external item into \'' + sbox.ospath('D1/X/X') + '\':\n',
+    ' U   ' + sbox.ospath('D1/X/X') + '\n',
+    '\n',
+    'Fetching external item into \'' + sbox.ospath('D1/X/X/X') + '\':\n',
+    'Updated external to revision 2.\n',
+    '\n',
+    'External at revision 2.\n',
+    '\n',
+    'External at revision 2.\n',
+    '\n',
+    'At revision 2.\n'
+    ]
+  svntest.actions.run_and_verify_svn(expected_output, [],
+                                     'update', sbox.ospath('D1'))
+
+
 ########################################################################
 # Run the tests
 
@@ -3607,6 +3638,7 @@ test_list = [ None,
               switch_relative_externals,
               copy_file_external_to_repo,
               replace_tree_with_foreign_external,
+              nested_notification,
              ]
 
 if __name__ == '__main__':

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/history_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/history_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/history_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/history_tests.py Mon Feb  9 16:46:16 2015
@@ -78,8 +78,7 @@ def cat_traces_renames(sbox):
   svntest.main.run_svn(None, 'mv', pi_path, rho_path)
 
   # svn cat -r1 rho  --> should show pi's contents.
-  svntest.actions.run_and_verify_svn(None,
-                                     [ "This is the file 'pi'.\n"], [],
+  svntest.actions.run_and_verify_svn([ "This is the file 'pi'.\n"], [],
                                      'cat',  '-r', '1', rho_path)
 
   expected_output = svntest.wc.State(wc_dir, {
@@ -115,28 +114,24 @@ def cat_traces_renames(sbox):
                                         expected_status)
 
   # 'svn cat bloo' --> should show rho's contents.
-  svntest.actions.run_and_verify_svn(None,
-                                     [ "This is the file 'rho'.\n"], [],
+  svntest.actions.run_and_verify_svn([ "This is the file 'rho'.\n"], [],
                                      'cat',  bloo_path)
 
   # svn cat -r1 bloo --> should still show rho's contents.
-  svntest.actions.run_and_verify_svn(None,
-                                     [ "This is the file 'rho'.\n"], [],
+  svntest.actions.run_and_verify_svn([ "This is the file 'rho'.\n"], [],
                                      'cat',  '-r', '1', bloo_path)
 
   # svn cat -r1 rho  --> should show pi's contents.
-  svntest.actions.run_and_verify_svn(None,
-                                     [ "This is the file 'pi'.\n"], [],
+  svntest.actions.run_and_verify_svn([ "This is the file 'pi'.\n"], [],
                                      'cat',  '-r', '1', rho_path)
 
   # svn up -r1
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r', '1', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', '-r', '1', wc_dir)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # svn cat -rHEAD rho --> should see 'unrelated object' error.
-  svntest.actions.run_and_verify_svn("unrelated object",
-                                     None, svntest.verify.AnyOutput,
+  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
                                      'cat',  '-r', 'HEAD', rho_path)
 
 @Issue(1970)
@@ -205,7 +200,7 @@ def cat_avoids_false_identities(sbox):
   # 'svn cat -r2 iota' should error, because the line of history
   # currently identified by /iota did not exist in r2, even though a
   # totally unrelated file of the same name did.
-  svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
                                      'cat', '-r', '2', iota_path)
 
 

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/import_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/import_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/import_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/import_tests.py Mon Feb  9 16:46:16 2015
@@ -79,7 +79,7 @@ def import_executable(sbox):
   # import new files into repository
   url = sbox.repo_url
   exit_code, output, errput =   svntest.actions.run_and_verify_svn(
-    None, None, [], 'import',
+    None, [], 'import',
     '-m', 'Log message for new import', xt_path, url)
 
   lastline = output.pop().strip()
@@ -158,7 +158,7 @@ def import_ignores(sbox):
   url = sbox.repo_url + '/dir'
 
   exit_code, output, errput = svntest.actions.run_and_verify_svn(
-    None, None, [], 'import',
+    None, [], 'import',
     '-m', 'Log message for new import',
     dir_path, url)
 
@@ -225,7 +225,7 @@ def import_no_ignores(sbox):
   url = sbox.repo_url + '/dir'
 
   exit_code, output, errput = svntest.actions.run_and_verify_svn(
-    None, None, [], 'import',
+    None, [], 'import',
     '-m', 'Log message for new import', '--no-ignore',
     dir_path, url)
 
@@ -286,15 +286,14 @@ def import_avoid_empty_revision(sbox):
   os.makedirs(empty_dir)
 
   url = sbox.repo_url
-  svntest.actions.run_and_verify_svn(None, None, [], 'import',
+  svntest.actions.run_and_verify_svn(None, [], 'import',
                                      '-m', 'Log message for new import',
                                      empty_dir, url)
 
   svntest.main.safe_rmtree(empty_dir)
 
   # Verify that an empty revision has not been created
-  svntest.actions.run_and_verify_svn(None,
-                                     exp_noop_up_out(1),
+  svntest.actions.run_and_verify_svn(exp_noop_up_out(1),
                                      [], "update",
                                      empty_dir)
 #----------------------------------------------------------------------
@@ -333,7 +332,7 @@ enable-auto-props = yes
   os.mkdir(imp_dir_path, 0755)
   svntest.main.file_write(imp_file_path, "This is file test.dsp.\n")
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'import',
+  svntest.actions.run_and_verify_svn(None, [], 'import',
                                      '-m', 'Log message for new import',
                                      imp_dir_path,
                                      sbox.repo_url,
@@ -371,7 +370,7 @@ enable-auto-props = yes
   "+Extra line" + crlf
   ]
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'diff',
                                      file_path,
                                      '--config-dir', config_dir)
@@ -389,7 +388,7 @@ enable-auto-props = yes
                                   "The third line.\r")
 
   # The import should succeed and not error out
-  svntest.actions.run_and_verify_svn(None, None, [], 'import',
+  svntest.actions.run_and_verify_svn(None, [], 'import',
                                      '-m', 'Log message for new import',
                                      imp_dir_path,
                                      sbox.repo_url,
@@ -407,7 +406,7 @@ def import_into_foreign_repo(sbox):
   svntest.main.safe_rmtree(other_repo_dir, 1)
   svntest.main.create_repos(other_repo_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'import',
+  svntest.actions.run_and_verify_svn(None, [], 'import',
                                      '-m', 'Log message for new import',
                                      sbox.ospath('A/mu'), other_repo_url + '/f')
 
@@ -478,7 +477,7 @@ def import_inherited_ignores(sbox):
   # global-ignores config. Lastly, ^/A/B/E should not get any *.foo paths
   # because of the svn:ignore property on ^/A/B/E, but non-immediate children
   # of ^/A/B/E are permitted *.foo paths.
-  svntest.actions.run_and_verify_svn(None, None, [], 'import',
+  svntest.actions.run_and_verify_svn(None, [], 'import',
                                      '--config-dir', config_dir,
                                      import_tree_dir,
                                      sbox.repo_url + '/A/B/E',
@@ -493,13 +492,13 @@ def import_inherited_ignores(sbox):
      'A    ' + os.path.join(E_path, dir7_path)  + '\n',
      'A    ' + os.path.join(E_path, file7_path) + '\n',
      'Updated to revision 3.\n'])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(expected_output, [], 'up', wc_dir)
 
   # Import the tree to ^/A/B/E/Z.  The only difference from above is that
   # DIR3.foo and its child file2.txt are also imported.  Why? Because now
   # we are creating a new directory in ^/A/B/E, so the svn:ignore property
   # set on ^/A/B/E doesn't apply.
-  svntest.actions.run_and_verify_svn(None, None, [], 'import',
+  svntest.actions.run_and_verify_svn(None, [], 'import',
                                      '--config-dir', config_dir,
                                      import_tree_dir,
                                      sbox.repo_url + '/A/B/E/Z',
@@ -517,12 +516,12 @@ def import_inherited_ignores(sbox):
      'A    ' + os.path.join(Z_path, dir3_path)  + '\n',
      'A    ' + os.path.join(Z_path, file2_path) + '\n',
      'Updated to revision 4.\n'])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(expected_output, [], 'up', wc_dir)
 
   # Import the tree to ^/A/B/F with the --no-ignore option.
   # No ignores should be considered and the whole tree should
   # be imported.
-  svntest.actions.run_and_verify_svn(None, None, [], 'import',
+  svntest.actions.run_and_verify_svn(None, [], 'import',
                                      '--config-dir', config_dir,
                                      '--no-ignore', import_tree_dir,
                                      sbox.repo_url + '/A/B/F',
@@ -546,12 +545,12 @@ def import_inherited_ignores(sbox):
      'A    ' + os.path.join(F_path, file7_path) + '\n',
      'A    ' + os.path.join(F_path, dir8_path)  + '\n',
      'Updated to revision 5.\n'])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(expected_output, [], 'up', wc_dir)
 
   # Try importing a single file into a directory which has svn:ignore set
   # on it with a matching pattern of the imported file.  The import should
   # be a no-op.
-  svntest.actions.run_and_verify_svn(None, [], [], 'import',
+  svntest.actions.run_and_verify_svn([], [], 'import',
                                      '--config-dir', config_dir,
                                      os.path.join(import_tree_dir,
                                                   'DIR6', 'file6.foo'),
@@ -560,7 +559,7 @@ def import_inherited_ignores(sbox):
 
   # Try the above, but this time with --no-ignore, this time the import
   # should succeed.
-  svntest.actions.run_and_verify_svn(None, None, [], 'import', '--no-ignore',
+  svntest.actions.run_and_verify_svn(None, [], 'import', '--no-ignore',
                                      '--config-dir', config_dir,
                                      os.path.join(import_tree_dir,
                                                   'DIR6', 'file6.foo'),
@@ -570,7 +569,7 @@ def import_inherited_ignores(sbox):
     ["Updating '" + wc_dir + "':\n",
      'A    ' + os.path.join(E_path, 'file6.foo') + '\n',
      'Updated to revision 6.\n'])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(expected_output, [], 'up', wc_dir)
 
 #----------------------------------------------------------------------
 

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/info_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/info_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/info_tests.py Mon Feb  9 16:46:16 2015
@@ -180,7 +180,7 @@ def info_with_tree_conflicts(sbox):
     svntest.actions.run_and_verify_info([expected_info], path)
 
     # check XML info
-    exit_code, output, error = svntest.actions.run_and_verify_svn(None, None,
+    exit_code, output, error = svntest.actions.run_and_verify_svn(None,
                                                                   [], 'info',
                                                                   path,
                                                                   '--xml')
@@ -208,7 +208,7 @@ def info_with_tree_conflicts(sbox):
 def info_on_added_file(sbox):
   """info on added file"""
 
-  svntest.actions.make_repo_and_wc(sbox)
+  sbox.build()
   wc_dir = sbox.wc_dir
 
   # create new file
@@ -233,7 +233,7 @@ def info_on_added_file(sbox):
   svntest.actions.run_and_verify_info([expected], new_file)
 
   # check XML info
-  exit_code, output, error = svntest.actions.run_and_verify_svn(None, None,
+  exit_code, output, error = svntest.actions.run_and_verify_svn(None,
                                                                 [], 'info',
                                                                 new_file,
                                                                 '--xml')
@@ -251,7 +251,7 @@ def info_on_added_file(sbox):
 
 def info_on_mkdir(sbox):
   """info on new dir with mkdir"""
-  svntest.actions.make_repo_and_wc(sbox)
+  sbox.build()
   wc_dir = sbox.wc_dir
 
   # create a new directory using svn mkdir
@@ -273,7 +273,7 @@ def info_on_mkdir(sbox):
   svntest.actions.run_and_verify_info([expected], new_dir)
 
   # check XML info
-  exit_code, output, error = svntest.actions.run_and_verify_svn(None, None,
+  exit_code, output, error = svntest.actions.run_and_verify_svn(None,
                                                                 [], 'info',
                                                                 new_dir,
                                                                 '--xml')
@@ -351,7 +351,7 @@ def info_multiple_targets(sbox):
     non_existent_path = os.path.join(wc_dir, 'non-existent')
 
     # All targets are existing
-    svntest.actions.run_and_verify_svn2(None, None, [],
+    svntest.actions.run_and_verify_svn2(None, [],
                                         0, 'info', alpha, beta)
 
     # One non-existing target
@@ -374,7 +374,7 @@ def info_multiple_targets(sbox):
     non_existent_url = sbox.repo_url +  '/non-existent'
 
     # All targets are existing
-    svntest.actions.run_and_verify_svn2(None, None, [],
+    svntest.actions.run_and_verify_svn2(None, [],
                                         0, 'info', alpha, beta)
 
     # One non-existing target
@@ -483,12 +483,12 @@ def info_show_exclude(sbox):
   expected_error = 'svn: E200009: Could not display info for all targets.*'
 
   # Expect error on iota (status = not-present)
-  svntest.actions.run_and_verify_svn(None, [], expected_error, 'info', iota)
+  svntest.actions.run_and_verify_svn([], expected_error, 'info', iota)
 
   sbox.simple_update()
 
   # Expect error on iota (unversioned)
-  svntest.actions.run_and_verify_svn(None, [], expected_error, 'info', iota)
+  svntest.actions.run_and_verify_svn([], expected_error, 'info', iota)
 
 @Issue(3998)
 def binary_tree_conflict(sbox):
@@ -558,7 +558,7 @@ def relpath_escaping(sbox):
 
   # Also test the local path (to help resolving the relative path) and an
   # unescaped path which the client should automatically encode
-  svntest.actions.run_and_verify_svn(None, None, [], 'info',
+  svntest.actions.run_and_verify_svn(None, [], 'info',
                                      info[0]['Relative URL'],
                                      info[0]['URL'],
                                      testpath,

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/input_validation_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/input_validation_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/input_validation_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/input_validation_tests.py Mon Feb  9 16:46:16 2015
@@ -52,7 +52,7 @@ def run_and_verify_svn_in_wc(sbox, expec
   old_dir = os.getcwd()
   try:
     os.chdir(wc_dir)
-    svntest.actions.run_and_verify_svn(None, [], expected_stderr,
+    svntest.actions.run_and_verify_svn([], expected_stderr,
                                        *varargs)
   finally:
     os.chdir(old_dir)
@@ -279,18 +279,18 @@ def delete_repos_root(sbox):
   # Delete the wcroot (which happens to be the repository root)
   expected_error = 'svn: E155035: \'.*\' is the root of a working copy ' + \
                    'and cannot be deleted'
-  svntest.actions.run_and_verify_svn('Delete root', [], expected_error,
+  svntest.actions.run_and_verify_svn([], expected_error,
                                      'rm', wc_dir)
 
   # This should produce some error, because we can never commit this
   expected_error = '.*repository root.*'
-  svntest.actions.run_and_verify_svn('Move root', None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'mv', sbox.ospath('A/D/G'),
                                      sbox.ospath('Z'))
 
   # And this currently fails with another nasty error about a wc-lock
   expected_error = '.*repository root.*'
-  svntest.actions.run_and_verify_svn('Delete root', [], expected_error,
+  svntest.actions.run_and_verify_svn([], expected_error,
                                      'rm', sbox.ospath('A/B/F'))
 
 ########################################################################

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_authz_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_authz_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_authz_tests.py Mon Feb  9 16:46:16 2015
@@ -110,7 +110,7 @@ def iprops_authz(sbox):
   else:
     expected_err = ".*svn: E170001: Authorization failed.*"
   svntest.actions.run_and_verify_svn(
-    None, None, expected_err, 'proplist', '-v',
+    None, expected_err, 'proplist', '-v',
     '--show-inherited-props', sbox.repo_url + '/A/D/H/psi')
 
 ########################################################################

Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/iprop_tests.py Mon Feb  9 16:46:16 2015
@@ -160,7 +160,7 @@ def iprops_basic_working(sbox):
     psi_path, expected_iprops, expected_explicit_props)
 
   # Proplist file target with only explicit props.
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'revert', wc_dir)
   expected_iprops = {}
   expected_explicit_props = {'FileProp1' : 'File-Prop-Val1'}
   svntest.actions.run_and_verify_inherited_prop_xml(
@@ -184,7 +184,7 @@ def iprops_basic_repos(sbox):
   svntest.main.run_svn(None, 'commit', '-m', 'Add some file properties',
                        wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   sbox.simple_propset('RootProp1', 'Root-Prop-Val1', '.')
   sbox.simple_propset('RootProp2', 'Root-Prop-Val2', '.')
   sbox.simple_propset('DirProp2', 'Dir-Prop-Val-Root', '.')
@@ -317,7 +317,7 @@ def iprops_switched_subtrees(sbox):
                        sbox.repo_url + '/branch2', '-m', 'Make branch2')
 
   # Create a root property and two branch properties
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   sbox.simple_propset('Root-Prop-1', 'Root-Prop-Val1', '.')
   sbox.simple_propset('Branch-Name', 'Feature #1', 'branch1')
   sbox.simple_propset('Branch-Name', 'Feature #2', 'branch2')
@@ -348,7 +348,7 @@ def iprops_switched_subtrees(sbox):
   # which does inherit properties from ^/branch1 and ^/.  The inherited
   # properties cache should be updated to reflect this when asking what
   # properties branch2/B/lambda inherits.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_iprops = {
     sbox.repo_url              : {'Root-Prop-1' : 'Root-Prop-Val1'},
     sbox.repo_url + '/branch1' : {'Branch-Name' : 'Feature #1'}}
@@ -359,20 +359,20 @@ def iprops_switched_subtrees(sbox):
   # Now update the WC back to r3, where there are no properties.  The
   # inheritable properties cache for the WC-root at branch2/B should be
   # cleared and no inheritable properties found for branch2/B/lambda.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r3', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', '-r3', wc_dir)
   expected_iprops = {}
   expected_explicit_props = {}
   svntest.actions.run_and_verify_inherited_prop_xml(
     branch2_lambda_path, expected_iprops, expected_explicit_props)
   # Update back to HEAD=r4 before continuing.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # Now unswitch branch2/B and check branch2/B/lambda's inherited props.
   # Now no iprop cache for branch2/B should exist and branch2/B/lambda
   # should inherit from branch2 and '.'.
   svntest.main.run_svn(None, 'switch', sbox.repo_url + '/branch2/B',
                        branch2_B_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   expected_iprops = {
     ### Working copy parents! ###
     wc_dir       : {'Root-Prop-1' : 'Root-Prop-Val1'},
@@ -893,8 +893,8 @@ def iprops_pegged_wc_targets(sbox):
   # Inherited props should always come from the repository parent of
   # ^/A/B/E/alpha and so should not include the property (working or
   # otherwise) on A/D.
-  svntest.actions.run_and_verify_svn(None, None, [], 'delete', G_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'copy',
+  svntest.actions.run_and_verify_svn(None, [], 'delete', G_path)
+  svntest.actions.run_and_verify_svn(None, [], 'copy',
                                     sbox.repo_url + '/A/B', G_path)
 
   # Operation | Target | Peg Revision | Operative Revision
@@ -1138,11 +1138,11 @@ def iprops_pegged_wc_targets(sbox):
   # Revert the replacement with history of A/D/G and once again
   # replace A/D/G, but this time without history (using and export
   # of A/B.
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', G_path, '-R')
-  svntest.actions.run_and_verify_svn(None, None, [], 'delete', G_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'export',
+  svntest.actions.run_and_verify_svn(None, [], 'revert', G_path, '-R')
+  svntest.actions.run_and_verify_svn(None, [], 'delete', G_path)
+  svntest.actions.run_and_verify_svn(None, [], 'export',
                                      sbox.repo_url + '/A/B', G_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', G_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', G_path)
   # Set a working prop on a file within the replaced tree, we should *never*
   # see this property if asking about the
   # file@[HEAD | PREV | COMMITTED | BASE]
@@ -1156,21 +1156,21 @@ def iprops_pegged_wc_targets(sbox):
   #
   # proplist/propget WC-PATH@HEAD
   svntest.actions.run_and_verify_svn(
-    None, None,
+    None,
     ".*Unknown node kind for '" + sbox.repo_url + "/A/D/G/E/alpha'\n",
     'pl', '-v', '--show-inherited-props', replaced_alpha_path + '@HEAD')
   svntest.actions.run_and_verify_svn(
-    None, None,
+    None,
     ".*'" + sbox.repo_url + "/A/D/G/E/alpha' does not exist in revision 3\n",
     'pg', 'RootProp1', '-v', '--show-inherited-props',
     replaced_alpha_path + '@HEAD')
   # proplist/propget WC-PATH@PREV
   svntest.actions.run_and_verify_svn(
-    None, None,
+    None,
     ".*Path '.*alpha' has no committed revision\n",
     'pl', '-v', '--show-inherited-props', replaced_alpha_path + '@PREV')
   svntest.actions.run_and_verify_svn(
-    None, None,
+    None,
     ".*Path '.*alpha' has no committed revision\n",
     'pg', 'RootProp1', '-v', '--show-inherited-props', replaced_alpha_path + '@PREV')
   # proplist/propget WC-PATH@COMMITTED
@@ -1421,7 +1421,7 @@ def iprops_shallow_operative_depths(sbox
   # r2 - Create a branch..
   svntest.main.run_svn(None, 'copy', sbox.repo_url + '/A',
                        sbox.repo_url + '/branch1', '-m', 'Make branch1')
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # r3 - Create a root property and some branch properties
   sbox.simple_propset('Root-Prop-1', 'Root-Prop-Val1', '.')
@@ -1437,7 +1437,7 @@ def iprops_shallow_operative_depths(sbox
   svntest.main.run_svn(None, 'commit', '-m', 'Change some properties',
                        wc_dir)
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # Switch the WC to ^/branch1:
   svntest.main.run_svn(None, 'switch', '--ignore-ancestry',
@@ -1449,7 +1449,7 @@ def iprops_shallow_operative_depths(sbox
   svntest.main.run_svn(None, 'switch', sbox.repo_url + '/A/mu',
                        sbox.ospath('mu'))
   # Update the whole WC back to r3.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r3', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', '-r3', wc_dir)
 
   # Check the inherited props on B/E within the switched subtree
   # and the switched file mu.  The props should all be inherited
@@ -1467,7 +1467,7 @@ def iprops_shallow_operative_depths(sbox
   # Again check the inherited props on B/E.  This shouldn't affect the
   # switched subtree at all, the props it inherits should still reflect
   # the values at r3.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--depth=empty', wc_dir)
   svntest.actions.run_and_verify_inherited_prop_xml(
     sbox.ospath('B/E'), expected_iprops, expected_explicit_props)
@@ -1476,7 +1476,7 @@ def iprops_shallow_operative_depths(sbox
 
   # Update the root of the WC (to HEAD=r4) at depth=files.  B/E should
   # still inherit vales from r3, but mu should now inherit props from r4.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--depth=files', wc_dir)
   svntest.actions.run_and_verify_inherited_prop_xml(
     sbox.ospath('B/E'), expected_iprops, expected_explicit_props)
@@ -1489,7 +1489,7 @@ def iprops_shallow_operative_depths(sbox
 
   # Update the root of the WC (to HEAD=r4) at depth=immediates.  Now both B/E
   # and mu inherit props from r4.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up',
+  svntest.actions.run_and_verify_svn(None, [], 'up',
                                      '--depth=immediates', wc_dir)
   svntest.actions.run_and_verify_inherited_prop_xml(
     sbox.ospath('B/E'), expected_iprops, expected_explicit_props)
@@ -1509,7 +1509,7 @@ def iprops_with_directory_externals(sbox
   other_repo_dir, other_repo_url = sbox.add_repo_path("other")
   other_wc_dir = sbox.add_wc_path("other")
   svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 1)
-  svntest.actions.run_and_verify_svn(None, None, [], 'co', other_repo_url,
+  svntest.actions.run_and_verify_svn(None, [], 'co', other_repo_url,
                                      other_wc_dir)
 
   # Create a root property on the first WC.
@@ -1518,7 +1518,7 @@ def iprops_with_directory_externals(sbox
                        wc_dir)
 
   # Create a root property on the "other" WC.
-  svntest.actions.run_and_verify_svn(None, None, [], 'ps', 'Other-Root-Prop',
+  svntest.actions.run_and_verify_svn(None, [], 'ps', 'Other-Root-Prop',
                                      'Root-Prop-Val-from-other', other_wc_dir)
   svntest.main.run_svn(None, 'commit', '-m', 'Add a root property',
                        other_wc_dir)
@@ -1533,20 +1533,20 @@ def iprops_with_directory_externals(sbox
   sbox.simple_propset('svn:externals',
                       other_repo_url + '/A/D/G X-Other-Repos',
                       'E')
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci',
+  svntest.actions.run_and_verify_svn(None, [], 'ci',
                                      '-m', 'Add external point to other WC',
                                      wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # Create an external in the first WC that points to a location in the
   # same WC.
   sbox.simple_propset('svn:externals',
                       sbox.repo_url + '/A/D/H X-Same-Repos',
                       'F')
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Add external pointing to same repos',
                                      wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # Check the properties inherited by the external from the same repository.
   # It should inherit the props from the root of the same repository.
@@ -1590,9 +1590,9 @@ def iprops_with_file_externals(sbox):
   sbox.simple_propset('svn:externals',
                       sbox.repo_url + '/A/D/H/psi@4 file-external-pegged',
                       'A/B/F')
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', '-m',
+  svntest.actions.run_and_verify_svn(None, [], 'ci', '-m',
                                      'Add a file external', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # Check the properties inherited by the external files.  Both should
   # inherit the properties from ^/ and ^/A/D.
@@ -1622,7 +1622,7 @@ def iprops_with_file_externals(sbox):
     expected_explicit_props)
 
   # ...We update the external:
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   # The pegged file external's iprops should remain unchanged.
   svntest.actions.run_and_verify_inherited_prop_xml(
     sbox.ospath('A/B/F/file-external-pegged'), expected_iprops,



Mime
View raw message