subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1659238 [19/21] - in /subversion/branches/fsx-1.10: ./ build/generator/ build/generator/templates/ subversion/bindings/swig/ subversion/include/ subversion/include/private/ subversion/libsvn_delta/ subversion/libsvn_fs_base/ subversion/lib...
Date Thu, 12 Feb 2015 12:21:32 GMT
Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/sandbox.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/sandbox.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svntest/sandbox.py Thu Feb 12 12:21:31 2015
@@ -40,7 +40,7 @@ def make_mirror(sbox, source_prop_encodi
   dest_sbox = sbox.clone_dependent()
   dest_sbox.build(create_wc=False, empty=True)
   exit_code, output, errput = svntest.main.run_svnlook("uuid", sbox.repo_dir)
-  svntest.actions.run_and_verify_svnadmin2("Setting UUID", None, None, 0,
+  svntest.actions.run_and_verify_svnadmin2(None, None, 0,
                                            'setuuid', dest_sbox.repo_dir,
                                            output[0][:-1])
   svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
@@ -70,7 +70,7 @@ def verify_mirror(repo_url, repo_dir, ex
   for prop_name in ("svn:sync-from-url", "svn:sync-from-uuid",
                     "svn:sync-last-merged-rev"):
     svntest.actions.run_and_verify_svn(
-      None, None, [], "propdel", "--revprop", "-r", "0",
+      None, [], "propdel", "--revprop", "-r", "0",
       prop_name, repo_url)
   # Create a dump file from the mirror repository.
   dumpfile_s_n = svntest.actions.run_and_verify_dump(repo_dir)
@@ -435,7 +435,7 @@ class Sandbox:
 
   def youngest(self):
     _, output, _ = svntest.actions.run_and_verify_svnlook(
-                     None, svntest.verify.AnyOutput, [],
+                     svntest.verify.AnyOutput, [],
                      'youngest', self.repo_dir)
     youngest = int(output[0])
     return youngest

Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/svnversion_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/svnversion_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/svnversion_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/svnversion_tests.py Thu Feb 12 12:21:31 2015
@@ -50,25 +50,22 @@ def svnversion_test(sbox):
   repo_url = sbox.repo_url
 
   # Unmodified
-  svntest.actions.run_and_verify_svnversion("Unmodified working copy",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1\n" ], [])
 
   # Unmodified, whole wc switched
-  svntest.actions.run_and_verify_svnversion("Unmodified switched working copy",
-                                            wc_dir, "some/other/url",
+  svntest.actions.run_and_verify_svnversion(wc_dir, "some/other/url",
                                             [ "1S\n" ], [])
 
   mu_path = os.path.join(wc_dir, 'A', 'mu')
   svntest.main.file_append(mu_path, 'appended mu text')
 
   # Modified file
-  svntest.actions.run_and_verify_svnversion("Modified file",
-                                            mu_path, repo_url + '/A/mu',
+  svntest.actions.run_and_verify_svnversion(mu_path, repo_url + '/A/mu',
                                             [ "1M\n" ], [])
 
   # Text modified
-  svntest.actions.run_and_verify_svnversion("Modified text", wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1M\n" ], [])
 
   expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
@@ -80,17 +77,15 @@ def svnversion_test(sbox):
     raise svntest.Failure
 
   # Unmodified, mixed
-  svntest.actions.run_and_verify_svnversion("Unmodified mixed working copy",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1:2\n" ], [])
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'blue', 'azul',
                                      os.path.join(wc_dir, 'A', 'mu'))
 
   # Prop modified, mixed
-  svntest.actions.run_and_verify_svnversion("Property modified mixed wc",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1:2M\n" ], [])
 
   iota_path = os.path.join(wc_dir, 'iota')
@@ -113,40 +108,34 @@ def svnversion_test(sbox):
     raise svntest.Failure
 
   # Prop modified, mixed, part wc switched
-  svntest.actions.run_and_verify_svnversion("Prop-mod mixed partly switched",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1:2MS\n" ], [])
 
   # Plain (exported) directory that is a direct subdir of a versioned dir
   Q_path = os.path.join(wc_dir, 'Q')
   os.mkdir(Q_path)
-  svntest.actions.run_and_verify_svnversion("Exported subdirectory",
-                                            Q_path, repo_url,
+  svntest.actions.run_and_verify_svnversion(Q_path, repo_url,
                                             [ "Unversioned directory\n" ], [])
 
   # Plain (exported) directory that is not a direct subdir of a versioned dir
   R_path = os.path.join(Q_path, 'Q')
   os.mkdir(R_path)
-  svntest.actions.run_and_verify_svnversion("Exported directory",
-                                            R_path, repo_url,
+  svntest.actions.run_and_verify_svnversion(R_path, repo_url,
                                             [ "Unversioned directory\n" ], [])
 
   # Switched file
-  svntest.actions.run_and_verify_svnversion("Switched file",
-                                            iota_path, repo_url + '/iota',
+  svntest.actions.run_and_verify_svnversion(iota_path, repo_url + '/iota',
                                             [ "2S\n" ], [])
 
   # Unversioned file
   kappa_path = os.path.join(wc_dir, 'kappa')
   svntest.main.file_write(kappa_path, "This is the file 'kappa'.")
-  svntest.actions.run_and_verify_svnversion("Unversioned file",
-                                            kappa_path, repo_url,
+  svntest.actions.run_and_verify_svnversion(kappa_path, repo_url,
                                             [ "Unversioned file\n" ], [])
 
   # Nonexistent file or directory
   X_path = os.path.join(wc_dir, 'Q', 'X')
-  svntest.actions.run_and_verify_svnversion("Nonexistent file or directory",
-                                            X_path, repo_url,
+  svntest.actions.run_and_verify_svnversion(X_path, repo_url,
                                             None, [ "'%s' doesn't exist\n"
                                                    % os.path.abspath(X_path) ])
 
@@ -167,7 +156,7 @@ def svnversion_test(sbox):
                                           "--depth=files")
 
   # Partial (sparse) checkout
-  svntest.actions.run_and_verify_svnversion("Sparse checkout", A_A_path,
+  svntest.actions.run_and_verify_svnversion(A_A_path,
                                             repo_url, [ "2SP\n" ], [])
 
 
@@ -188,7 +177,7 @@ ext-file -r 1 %s/A/D/H/omega
 """ % (repo_url, repo_url)
   (fd, tmp_f) = tempfile.mkstemp(dir=wc_dir)
   svntest.main.file_append(tmp_f, externals_desc)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'pset',
                                      '-F', tmp_f, 'svn:externals', C_path)
   os.close(fd)
@@ -204,7 +193,7 @@ ext-file -r 1 %s/A/D/H/omega
                                         None, wc_dir)
 
   # Update to get it on disk
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
   ext_dir_path = os.path.join(C_path, 'ext-dir')
   ext_file_path = os.path.join(C_path, 'ext-file')
   expected_infos = [
@@ -213,8 +202,7 @@ ext-file -r 1 %s/A/D/H/omega
     ]
   svntest.actions.run_and_verify_info(expected_infos, ext_dir_path, ext_file_path)
 
-  svntest.actions.run_and_verify_svnversion("working copy with svn:externals",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "2\n" ], [])
 
 #----------------------------------------------------------------------
@@ -231,24 +219,21 @@ def svnversion_with_excluded_subtrees(sb
   D_path   = os.path.join(wc_dir, "A", "D")
   psi_path = os.path.join(wc_dir, "A", "D", "H", "psi")
 
-  svntest.actions.run_and_verify_svnversion("working copy with excluded dir",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1\n" ], [])
 
   # Exclude a directory and check that svnversion detects it.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'exclude', B_path)
-  svntest.actions.run_and_verify_svnversion("working copy with excluded dir",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1P\n" ], [])
 
   # Exclude a file and check that svnversion detects it.  Target the
   # svnversion command on a subtree that does not contain the excluded
   # directory to assure we a detecting the switched file.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '--set-depth', 'exclude', psi_path)
-  svntest.actions.run_and_verify_svnversion("working copy with excluded file",
-                                            D_path, repo_url + '/A/D',
+  svntest.actions.run_and_verify_svnversion(D_path, repo_url + '/A/D',
                                             [ "1P\n" ], [])
 
 def svnversion_with_structural_changes(sbox):
@@ -261,22 +246,20 @@ def svnversion_with_structural_changes(s
   iota_path = os.path.join(wc_dir, 'iota')
   iota_copy_path = os.path.join(wc_dir, 'iota_copy')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', iota_path, iota_copy_path)
 
-  svntest.actions.run_and_verify_svnversion("Copied file",
-                                            iota_copy_path, repo_url +
+  svntest.actions.run_and_verify_svnversion(iota_copy_path, repo_url +
                                             '/iota_copy',
                                             [ "Uncommitted local addition, "
                                             "copy or move\n" ],
                                             [])
   C_path = os.path.join(wc_dir, 'A', 'C')
   C_copy_path = os.path.join(wc_dir, 'C_copy')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', C_path, C_copy_path)
 
-  svntest.actions.run_and_verify_svnversion("Copied dir",
-                                            C_copy_path, repo_url +
+  svntest.actions.run_and_verify_svnversion(C_copy_path, repo_url +
                                             '/C_copy',
                                             [ "Uncommitted local addition, "
                                             "copy or move\n" ],
@@ -285,13 +268,12 @@ def svnversion_with_structural_changes(s
 
   # Test deletion
   sbox.simple_rm('iota')
-  svntest.actions.run_and_verify_svnversion("Deleted file",
-                                            sbox.ospath('iota'),
+  svntest.actions.run_and_verify_svnversion(sbox.ospath('iota'),
                                             repo_url + '/iota',
                                             ["1M\n"],
                                             [],
                                             )
-  svntest.actions.run_and_verify_svnversion("Deleted file", wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1:2M\n" ], [])
 
 def committed_revisions(sbox):
@@ -303,7 +285,7 @@ def committed_revisions(sbox):
   sbox.simple_copy('iota', 'iota2')
   sbox.simple_commit()
   sbox.simple_update()
-  svntest.actions.run_and_verify_svnversion("Committed revisions", wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1:2\n" ], [],
                                             "--committed")
 
@@ -313,8 +295,7 @@ def non_reposroot_wc(sbox):
   wc_dir = sbox.add_wc_path('wc2')
   repo_url = sbox.repo_url + "/A/B"
   svntest.main.run_svn(None, 'checkout', repo_url, wc_dir)
-  svntest.actions.run_and_verify_svnversion("Non-repos-root wc dir",
-                                            wc_dir, repo_url,
+  svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
                                             [ "1\n" ], [])
 
 @Issue(3858)
@@ -332,25 +313,24 @@ def child_switched(sbox):
   ### Target is repos root and WC root.
 
   # No switches.
-  svntest.actions.run_and_verify_svnversion(None, wc_dir, None,
+  svntest.actions.run_and_verify_svnversion(wc_dir, None,
                                             [ "2\n" ], [])
 
   # Switch A/B to a sibling.
   sbox.simple_switch(repo_url + '/A/D', 'A/B')
 
   # This should detect the switch at A/B.
-  svntest.actions.run_and_verify_svnversion(None, wc_dir, None,
+  svntest.actions.run_and_verify_svnversion(wc_dir, None,
                                             [ "2S\n" ], [])
 
   ### Target is neither repos root nor WC root.
 
   # But A/B/G and its children are not switched by itself.
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'A/B/G'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A/B/G'),
                                             None, [ "2\n" ], [])
 
   # And A/B isn't switched when you look at it directly.
-  svntest.actions.run_and_verify_svnversion(None, os.path.join(wc_dir, 'A/B'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A/B'),
                                             None, [ "2\n" ], [])
 
   # Switch branch/D to ^/A, then switch branch/D/G back to ^/branch/D/G so
@@ -359,37 +339,31 @@ def child_switched(sbox):
   sbox.simple_switch(repo_url + '/branch/D/G', 'branch/D/G')
 
   # This should detect the switch at branch/D and branch/D/G.
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'branch'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'branch'),
                                             None, [ "2S\n" ], [])
 
   # Directly targeting the switched branch/D should still detect the switch
   # at branch/D/G even though the latter isn't switched against the root of
   # the working copy.
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'branch',
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'branch',
                                                          'D'),
                                             None, [ "2S\n" ], [])
 
   # Switch A/B to ^/.
   sbox.simple_switch(repo_url, 'A/B')
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir),
                                             None, [ "2S\n" ], [])
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'A'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A'),
                                             None, [ "2S\n" ], [])
 
   ### Target is repos root but not WC root.
 
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'A', 'B'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A', 'B'),
                                             None, [ "2\n" ], [])
 
   # Switch A/B/A/D/G to ^/A/D/H.
   sbox.simple_switch(repo_url + '/A/D/H', 'A/B/A/D/G')
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'A', 'B'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A', 'B'),
                                             None, [ "2S\n" ], [])
 
   ### Target is not repos root but is WC root.
@@ -398,17 +372,14 @@ def child_switched(sbox):
   # ^A/D/G.
   sbox.simple_switch(repo_url + '/branch', '.')
   sbox.simple_switch(repo_url + '/A/D/G', 'D/G')
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir,),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir,),
                                             None, [ "2S\n" ], [])
 
   ### Target is neither repos root nor WC root.
 
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'D'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'D'),
                                             None, [ "2S\n" ], [])
-  svntest.actions.run_and_verify_svnversion(None,
-                                            os.path.join(wc_dir, 'D', 'H'),
+  svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'D', 'H'),
                                             None, [ "2\n" ], [])
 
 ########################################################################

Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/switch_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/switch_tests.py Thu Feb 12 12:21:31 2015
@@ -351,13 +351,11 @@ def delete_subdir(sbox):
   A2_url = sbox.repo_url + '/A2'
   A2_B_F_url = sbox.repo_url + '/A2/B/F'
 
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 2.\n'], [],
                                      'cp', '-m', 'make copy', A_url, A2_url)
 
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 3.\n'], [],
                                      'rm', '-m', 'delete subdir', A2_B_F_url)
 
@@ -392,7 +390,7 @@ def file_dir_file(sbox):
   file_url = sbox.repo_url + '/iota'
   dir_url = sbox.repo_url + '/A/C'
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+  svntest.actions.run_and_verify_svn(None, [], 'switch',
                                      '--ignore-ancestry', dir_url, file_path)
   if not os.path.isdir(file_path):
     raise svntest.Failure
@@ -402,7 +400,7 @@ def file_dir_file(sbox):
   # In this specific case the switch editor is designed to be rooted on the node
   # itself instead of its ancestor. If you would use sbox.ospath('A') for
   # file_path the switch works both ways.
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+  svntest.actions.run_and_verify_svn(None, [], 'switch',
                                      '--ignore-ancestry', file_url, file_path)
   if not os.path.isfile(file_path):
     raise svntest.Failure
@@ -447,7 +445,7 @@ def nonrecursive_switching(sbox):
   sbox.simple_commit()
 
   # Try to switch "wc2" to the branch (non-recursively)
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch', '-N',
+  svntest.actions.run_and_verify_svn(None, [], 'switch', '-N',
                                      '--ignore-ancestry', version1_url, wc2_dir)
 
   # Check the URLs of the (not switched) directories.
@@ -483,8 +481,7 @@ def failed_anchor_is_target(sbox):
   # Make a directory 'G/psi' in the repository.
   G_url = sbox.repo_url + '/A/D/G'
   G_psi_url = G_url + '/psi'
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 2.\n'], [],
                                      'mkdir', '-m', 'log msg', G_psi_url)
 
@@ -494,7 +491,7 @@ def failed_anchor_is_target(sbox):
   svntest.main.file_append(psi_path, "more text")
 
   # This switch raises a tree conflict on 'psi', because of the local mods.
-  svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+  svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                      'switch', '--ignore-ancestry',
                                      G_url, H_path)
 
@@ -545,8 +542,7 @@ def bad_intermediate_urls(sbox):
 
   # First, make an extra subdirectory in C to match one in the root, plus
   # another one inside of that.
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 2.\n'], [],
                                      'mkdir', '-m', 'log msg',
                                      url_A_C_A, url_A_C_A_Z)
@@ -651,13 +647,13 @@ def obstructed_switch(sbox):
     'Committed revision 2.\n',
   ]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', '-m',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'cp', '-m',
     'msgcopy', url_A_B_E, url_A_B_Esave)
 
   # svn rm A/B/E/alpha
   expected_stdout = ['D         ' + A_B_E_alpha + '\n']
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'rm',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'rm',
     A_B_E_alpha)
 
   # svn commit
@@ -706,7 +702,7 @@ def obstructed_switch(sbox):
   expected_stdout = verify.RegexOutput(
                       ".*local file unversioned, incoming file add upon switch",
                       match_all=False)
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'info',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'info',
     A_B_E_alpha)
 
 
@@ -751,7 +747,7 @@ def commit_mods_below_switch(sbox):
                                         False, '--ignore-ancestry')
 
   D_path = sbox.ospath('A/D')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'x', 'x', C_path, D_path)
 
   expected_status.tweak('A/C', 'A/D', status=' M')
@@ -786,8 +782,7 @@ def refresh_read_only_attribute(sbox):
   # Create a branch.
   url = sbox.repo_url + '/A'
   branch_url = sbox.repo_url + '/A-branch'
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 2.\n'], [],
                                      'cp', '-m', 'svn:needs-lock not set',
                                      url, branch_url)
@@ -795,7 +790,7 @@ def refresh_read_only_attribute(sbox):
   # Set the svn:needs-lock property on a file from the "trunk".
   A_path = sbox.ospath('A')
   mu_path = os.path.join(A_path, 'mu')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'svn:needs-lock', '1', mu_path)
 
   # Commit the propset of svn:needs-lock.
@@ -857,7 +852,7 @@ def switch_change_repos_root(sbox):
   # Test 1: A switch that changes to a non-existing repo shouldn't work.
   expected_err = ".*Unable to open repository.*|.*Could not open.*|"\
                  ".*Could not find.*|.*No repository found.*"
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
                                      expected_err,
                                      'switch', '--ignore-ancestry',
                                      other_A_url, A_wc_dir)
@@ -867,7 +862,7 @@ def switch_change_repos_root(sbox):
   other_A_url = other_repo_url +  "/A"
 
   svntest.main.create_repos(other_repo_dir)
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
                                      ".*UUID.*",
                                      'switch', '--ignore-ancestry',
                                      other_A_url, A_wc_dir)
@@ -1102,7 +1097,7 @@ def forced_switch_failures(sbox):
     'Tree conflict: local dir unversioned, incoming file add upon switch\n',
     match_all=False)
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'info',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'info',
     A_B_F_pi)
 
 
@@ -1115,7 +1110,7 @@ def forced_switch_failures(sbox):
     'Committed revision 2.\n',
   ])
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
     '-m', 'Log message', url_A_D_H_I)
 
   # Make A/D/G/I and co A/D/H/I into it.
@@ -1130,7 +1125,6 @@ def forced_switch_failures(sbox):
   })
 
   exit_code, so, se = svntest.actions.run_and_verify_svn(
-    "Unexpected error during co",
     ['Checked out revision 2.\n'], [],
     "co", url_A_D_H_I, A_D_G_I)
 
@@ -1242,7 +1236,7 @@ def switch_with_obstructing_local_adds(s
                           "This is the unversioned file 'upsilon'.\n")
 
   # Add the above obstructions.
-  svntest.actions.run_and_verify_svn("Add error:", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'add', G_path, I_path,
                                      gamma_copy_path)
 
@@ -1316,15 +1310,15 @@ def switch_scheduled_add(sbox):
   nodo_path = sbox.ospath('nodo')
 
   svntest.main.file_append(file_path, "")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'add', file_path)
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E200007: Cannot switch '.*file' " +
                                      "because it is not in the repository yet",
                                      'switch', '--ignore-ancestry',
                                      switch_url, file_path)
 
-  svntest.actions.run_and_verify_svn(None, None,
+  svntest.actions.run_and_verify_svn(None,
                                      "svn: E155010: The node '.*nodo' was not",
                                      'switch', '--ignore-ancestry',
                                      switch_url, nodo_path)
@@ -1360,7 +1354,7 @@ def mergeinfo_switch_elision(sbox):
      "Checked out revision 1.\n",
      "A         " + B_COPY_1_path + "\n",
     ])
-  svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
+  svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy',
                                      sbox.repo_url + "/A/B", B_COPY_1_path)
 
   expected_stdout = verify.UnorderedOutput([
@@ -1372,7 +1366,7 @@ def mergeinfo_switch_elision(sbox):
      "Checked out revision 1.\n",
      "A         " + B_COPY_2_path + "\n",
     ])
-  svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
+  svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy',
                                      sbox.repo_url + "/A/B", B_COPY_2_path)
 
   expected_output = svntest.wc.State(wc_dir, {
@@ -1580,8 +1574,7 @@ def mergeinfo_switch_elision(sbox):
                                         None, None, None, None, None, True,
                                         '--ignore-ancestry')
 
-  svntest.actions.run_and_verify_svn(None,
-                                     ["property '" + SVN_PROP_MERGEINFO +
+  svntest.actions.run_and_verify_svn(["property '" + SVN_PROP_MERGEINFO +
                                       "' set on '" + lambda_path + "'" +
                                       "\n"], [], 'ps', SVN_PROP_MERGEINFO,
                                      '/A/B/lambda:3-4', lambda_path)
@@ -2043,8 +2036,7 @@ def tolerate_local_mods(sbox):
   A_url = sbox.repo_url + '/A'
   A2_url = sbox.repo_url + '/A2'
 
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 2.\n'], [],
                                      'cp', '-m', 'make copy', A_url, A2_url)
 
@@ -2582,7 +2574,7 @@ def copy_with_switched_subdir(sbox):
   svntest.actions.run_and_verify_status(wc_dir, state)
 
   # Switch A/D/G
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+  svntest.actions.run_and_verify_svn(None, [], 'switch',
                                      '--ignore-ancestry', E_url, G)
 
   state.tweak('A/D/G', switched='S')
@@ -2594,7 +2586,7 @@ def copy_with_switched_subdir(sbox):
   svntest.actions.run_and_verify_status(wc_dir, state)
 
   # And now copy A/D and everything below it to R
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp', D, R)
+  svntest.actions.run_and_verify_svn(None, [], 'cp', D, R)
 
   state.add({
     'R'         : Item(status='A ', copied='+', wc_rev='-'),
@@ -2619,13 +2611,12 @@ def copy_with_switched_subdir(sbox):
 
   # Checkout working copy to verify result
   svntest.main.safe_rmtree(wc_dir, 1)
-  svntest.actions.run_and_verify_svn(None,
-                                     None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'checkout',
                                      sbox.repo_url, wc_dir)
 
   # Switch A/D/G again to recreate state
-  svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+  svntest.actions.run_and_verify_svn(None, [], 'switch',
                                      '--ignore-ancestry', E_url, G)
 
   # Clear the statuses
@@ -2649,15 +2640,15 @@ def up_to_old_rev_with_subtree_switched_
   # Starting with a vanilla greek tree, create a branch of A, switch
   # that branch to the root of the repository, then update the WC to
   # r1.
-  svntest.actions.run_and_verify_svn(None, None, [], 'copy', A_path,
+  svntest.actions.run_and_verify_svn(None, [], 'copy', A_path,
                                      branch_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+  svntest.actions.run_and_verify_svn(None, [], 'ci', wc_dir,
                                      '-m', 'Create a branch')
-  svntest.actions.run_and_verify_svn(None, None, [], 'sw', sbox.repo_url,
+  svntest.actions.run_and_verify_svn(None, [], 'sw', sbox.repo_url,
                                      branch_path, '--ignore-ancestry')
 
   # Now update the WC to r1.
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r1', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', '-r1', wc_dir)
 
 def different_node_kind(sbox):
   "switch to a different node kind"
@@ -2682,7 +2673,7 @@ def different_node_kind(sbox):
                                           None, expected_disk, expected_status,
                                           None, None, None, None, None, False,
                                           '--ignore-ancestry')
-    svntest.actions.run_and_verify_svn(None, None, [], 'info', full_path)
+    svntest.actions.run_and_verify_svn(None, [], 'info', full_path)
     if not os.path.isdir(full_path):
       raise svntest.Failure
 
@@ -2698,7 +2689,7 @@ def different_node_kind(sbox):
                                           None, expected_disk, expected_status,
                                           None, None, None, None, None, False,
                                           '--ignore-ancestry')
-    svntest.actions.run_and_verify_svn(None, None, [], 'info', full_path)
+    svntest.actions.run_and_verify_svn(None, [], 'info', full_path)
     if not os.path.isfile(full_path):
       raise svntest.Failure
 
@@ -2718,12 +2709,12 @@ def switch_to_spaces(sbox):
   repo_url = sbox.repo_url
 
   # Paths are normalized in the command processing, so %20 is equivalent to ' '
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', repo_url + '/A',
                                            repo_url + '/A%20with space',
                                      '-m', '')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mv', repo_url + '/A%20with space',
                                            repo_url + '/A with%20more spaces',
                                      '-m', '')
@@ -2871,7 +2862,7 @@ def switch_moves(sbox):
 
   branch_url = sbox.repo_url + '/branch'
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', sbox.wc_dir, branch_url,
                                      '-m', '')
 

Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/trans_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/trans_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/trans_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/trans_tests.py Thu Feb 12 12:21:31 2015
@@ -191,7 +191,7 @@ def setup_working_copy(wc_dir, value_len
 # Set the property keyword for PATH.  Turn on all possible keywords.
 ### todo: Later, take list of keywords to set.
 def keywords_on(path):
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      "svn:keywords",
                                      "Author Rev Date URL Id Header",
                                      path)
@@ -199,7 +199,7 @@ def keywords_on(path):
 # Delete property NAME from versioned PATH in the working copy.
 ### todo: Later, take list of keywords to remove from the propval?
 def keywords_off(path):
-  svntest.actions.run_and_verify_svn(None, None, [], 'propdel',
+  svntest.actions.run_and_verify_svn(None, [], 'propdel',
                                      "svn:keywords", path)
 
 
@@ -462,7 +462,7 @@ def update_modified_with_translation(sbo
   # Replace contents of rho and set eol translation to 'native'
   rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
   svntest.main.file_write(rho_path, "1\n2\n3\n4\n5\n6\n7\n8\n9\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'svn:eol-style', 'native',
                                      rho_path)
 
@@ -570,16 +570,16 @@ def eol_change_is_text_mod(sbox):
   f.close()
 
   # commit the file
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', foo_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [], 'add', foo_path)
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg',
                                      foo_path)
 
   if svntest.main.windows:
-    svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+    svntest.actions.run_and_verify_svn(None, [], 'propset',
                                        'svn:eol-style', 'LF', foo_path)
   else:
-    svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+    svntest.actions.run_and_verify_svn(None, [], 'propset',
                                        'svn:eol-style', 'CRLF', foo_path)
 
   # check 1: did new contents get transmitted?
@@ -587,7 +587,7 @@ def eol_change_is_text_mod(sbox):
                      "Transmitting file data .done\n",
                      "Committing transaction...\n",
                      "Committed revision 3.\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'ci', '-m', 'log msg', foo_path)
 
   # check 2: do the files have the right contents now?
@@ -617,20 +617,20 @@ def keyword_expanded_on_checkout(sbox):
   # The bug didn't occur if there were multiple files in the
   # directory, so setup an empty directory.
   Z_path = os.path.join(wc_dir, 'Z')
-  svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', Z_path)
+  svntest.actions.run_and_verify_svn(None, [], 'mkdir', Z_path)
 
   # Add the file that has the keyword to be expanded
   url_path = os.path.join(Z_path, 'url')
   svntest.main.file_append(url_path, "$URL$")
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', url_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', url_path)
   keywords_on(url_path)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg', wc_dir)
 
   other_wc_dir = sbox.add_wc_path('other')
   other_url_path = os.path.join(other_wc_dir, 'Z', 'url')
-  svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+  svntest.actions.run_and_verify_svn(None, [], 'checkout',
                                      sbox.repo_url,
                                      other_wc_dir)
 
@@ -657,7 +657,7 @@ def cat_keyword_expansion(sbox):
 
   # Set up A/mu to do $Rev$ keyword expansion
   svntest.main.file_append(mu_path , "$Rev$\n$Author$")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'svn:keywords', 'Rev Author',
                                      mu_path)
 
@@ -674,18 +674,18 @@ def cat_keyword_expansion(sbox):
   full_author = "x" * 400
   key_author = "x" * 244
   svntest.actions.enable_revprop_changes(sbox.repo_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', '--revprop', '-r2',
                                      'svn:author', full_author,
                                      sbox.wc_dir)
-  svntest.actions.run_and_verify_svn(None, [ full_author ], [],
+  svntest.actions.run_and_verify_svn([ full_author ], [],
                                      'propget', '--revprop', '-r2',
                                      'svn:author', '--strict',
                                      sbox.wc_dir)
 
   # Make another commit so that the last changed revision for A/mu is
   # not HEAD.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'bar', lambda_path)
   expected_output = wc.State(wc_dir, {
     'A/B/lambda' : Item(verb='Sending'),
@@ -697,8 +697,7 @@ def cat_keyword_expansion(sbox):
 
   # At one stage the keywords were expanded to values for the requested
   # revision, not to those committed revision
-  svntest.actions.run_and_verify_svn(None,
-                                     [ "This is the file 'mu'.\n",
+  svntest.actions.run_and_verify_svn([ "This is the file 'mu'.\n",
                                        "$Rev: 2 $\n",
                                        "$Author: " + key_author + " $"], [],
                                      'cat', '-r', 'HEAD', mu_path)
@@ -714,8 +713,8 @@ def copy_propset_commit(sbox):
   mu2_path = os.path.join(wc_dir, 'A', 'mu2')
 
   # Copy and propset
-  svntest.actions.run_and_verify_svn(None, None, [], 'copy', mu_path, mu2_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [], 'copy', mu_path, mu2_path)
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'svn:eol-style', 'native',
                                      mu2_path)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -757,7 +756,7 @@ def propset_commit_checkout_nocrash(sbox
                                         None, wc_dir)
 
   # Set property to do keyword expansion on A/mu, commit.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'svn:keywords', 'Rev', mu_path)
   expected_output = wc.State(wc_dir, {
     'A/mu' : Item(verb='Sending'),
@@ -772,7 +771,7 @@ def propset_commit_checkout_nocrash(sbox
   other_wc_dir = sbox.add_wc_path('other')
   mu_other_path = os.path.join(other_wc_dir, 'A', 'mu')
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+  svntest.actions.run_and_verify_svn(None, [], 'checkout',
                                      sbox.repo_url,
                                      other_wc_dir)
 
@@ -795,14 +794,14 @@ def propset_revert_noerror(sbox):
   # Set the Rev keyword for the mu file
   # could use the keywords_on()/keywords_off() functions to
   # set/del all svn:keywords
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'svn:keywords', 'Rev', mu_path)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/mu', status=' M')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Revert the propset
-  svntest.actions.run_and_verify_svn(None, None, [], 'revert', mu_path)
+  svntest.actions.run_and_verify_svn(None, [], 'revert', mu_path)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
@@ -917,11 +916,11 @@ def autoprops_inconsistent_eol(sbox):
   sbox.simple_add_text(text, 'add.c')
   sbox.simple_add_text(text, 'add-force.c')
 
-  svntest.actions.run_and_verify_svn(None, None, '.*inconsistent newlines.*',
+  svntest.actions.run_and_verify_svn(None, '.*inconsistent newlines.*',
                                      'ps', 'svn:eol-style', 'native',
                                      sbox.ospath('add.c'))
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'svn:eol-style', 'native', '--force',
                                      sbox.ospath('add.c'))
 
@@ -943,7 +942,7 @@ def autoprops_inconsistent_eol(sbox):
   expected_output = ['A         %s\n' % sbox.ospath('auto.c')]
 
   # Fails with svn: E200009: File '.*auto.c' has inconsistent newlines
-  svntest.actions.run_and_verify_svn(None, expected_output,
+  svntest.actions.run_and_verify_svn(expected_output,
                                      [], 'add', sbox.ospath('auto.c'))
 
 @XFail()
@@ -962,7 +961,7 @@ def autoprops_inconsistent_mime(sbox):
   expected_output = ['A         %s\n' % sbox.ospath('c.iota.c')]
 
   # Fails with svn: E200009: File '.*c.iota.c' has binary mime type property
-  svntest.actions.run_and_verify_svn(None, expected_output,
+  svntest.actions.run_and_verify_svn(expected_output,
                                      [], 'add', sbox.ospath('c.iota.c'))
 
 

Modified: subversion/branches/fsx-1.10/subversion/tests/cmdline/tree_conflict_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/tests/cmdline/tree_conflict_tests.py?rev=1659238&r1=1659237&r2=1659238&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/branches/fsx-1.10/subversion/tests/cmdline/tree_conflict_tests.py Thu Feb 12 12:21:31 2015
@@ -350,7 +350,7 @@ def set_up_repos(wc_dir, br_dir, scenari
     main.run_svn(None, 'mkdir', '--parents', P)
     for modaction in init_mods:
       modify(modaction, incoming_paths(wc_dir, P))
-  run_and_verify_svn(None, AnyOutput, [],
+  run_and_verify_svn(AnyOutput, [],
                      'commit', '-m', 'Initial set-up.', wc_dir)
   # Capture the revision number
   init_rev = 2  ### hard-coded
@@ -363,7 +363,7 @@ def set_up_repos(wc_dir, br_dir, scenari
       modify(modaction, incoming_paths(wc_dir, P))
 
   # commit all the modifications
-  run_and_verify_svn(None, AnyOutput, [],
+  run_and_verify_svn(AnyOutput, [],
                      'commit', '-m', 'Action.', wc_dir)
   # Capture the revision number
   changed_rev = 3  ### hard-coded
@@ -411,7 +411,7 @@ def ensure_tree_conflict(sbox, operation
     else:  # switch/merge
       # Make, and work in, a "branch2" that is a copy of "branch1".
       target_br = "branch2"
-      run_and_verify_svn(None, AnyOutput, [],
+      run_and_verify_svn(AnyOutput, [],
                          'copy', '-r', str(source_left_rev), url_of(source_br),
                          url_of(target_br),
                          '-m', 'Create target branch.')
@@ -435,7 +435,7 @@ def ensure_tree_conflict(sbox, operation
       for modaction in loc_action:
         modify(modaction, localmod_paths(".", target_path), is_init=False)
       if commit_local_mods:
-        run_and_verify_svn(None, AnyOutput, [],
+        run_and_verify_svn(AnyOutput, [],
                            'commit', target_path,
                            '-m', 'Mods in target branch.')
         head_rev += 1
@@ -462,15 +462,15 @@ def ensure_tree_conflict(sbox, operation
       # Do the main action
       if operation == 'update':
         logger.debug("--- Updating")
-        run_and_verify_svn(None, expected_stdout, [],
+        run_and_verify_svn(expected_stdout, [],
                            'update', target_path)
       elif operation == 'switch':
         logger.debug("--- Switching")
-        run_and_verify_svn(None, expected_stdout, [],
+        run_and_verify_svn(expected_stdout, [],
                            'switch', source_url, target_path)
       elif operation == 'merge':
         logger.debug("--- Merging")
-        run_and_verify_svn(None, expected_stdout, [],
+        run_and_verify_svn(expected_stdout, [],
                            'merge',
                            '--allow-mixed-revisions',
                            '-r', str(source_left_rev) + ':' + str(source_right_rev),
@@ -513,7 +513,7 @@ def ensure_tree_conflict(sbox, operation
                           "^      >   .* upon " + operation] +
                           svntest.main.summary_of_conflicts(tree_conflicts=1))
                           ])
-      run_and_verify_svn(None, expected_stdout, [],
+      run_and_verify_svn(expected_stdout, [],
                          'status', victim_path)
 
       logger.debug("--- Resolving the conflict")
@@ -523,14 +523,14 @@ def ensure_tree_conflict(sbox, operation
       run_and_verify_resolved([victim_path])
 
       logger.debug("--- Checking that 'status' does not report a conflict")
-      exitcode, stdout, stderr = run_and_verify_svn(None, None, [],
+      exitcode, stdout, stderr = run_and_verify_svn(None, [],
                                                 'status', victim_path)
       for line in stdout:
         if line[6] == 'C': # and line.endswith(victim_path + '\n'):
           raise svntest.Failure("unexpected status C") # on victim_path
 
       # logger.debug("--- Committing (should now succeed)")
-      # run_and_verify_svn(None, None, [],
+      # run_and_verify_svn(None, [],
       #                    'commit', '-m', '', target_path)
       # target_start_rev += 1
 
@@ -542,7 +542,7 @@ def ensure_tree_conflict(sbox, operation
     main.run_svn(None, 'revert', '-R', wc_dir)
     main.safe_rmtree(wc_dir)
     if operation != 'update':
-      run_and_verify_svn(None, AnyOutput, [],
+      run_and_verify_svn(AnyOutput, [],
                          'delete', url_of(target_br),
                          '-m', 'Delete target branch.')
       head_rev += 1
@@ -776,11 +776,9 @@ def force_del_tc_inside(sbox):
   main.run_svn(None, 'update', '-r2', wc_dir)
 
   # Set a meaningless prop on each dir and file
-  run_and_verify_svn(None,
-                     ["property 'propname' set on '" + dir + "'\n"],
+  run_and_verify_svn(["property 'propname' set on '" + dir + "'\n"],
                      [], 'ps', 'propname', 'propval', dir)
-  run_and_verify_svn(None,
-                     ["property 'propname' set on '" + file + "'\n"],
+  run_and_verify_svn(["property 'propname' set on '" + file + "'\n"],
                      [], 'ps', 'propname', 'propval', file)
 
   # Update WC to HEAD, tree conflicts result dir and file
@@ -808,8 +806,7 @@ def force_del_tc_inside(sbox):
                         wc_dir)
 
   # Delete A/C with --force, in effect disarming the tree-conflicts.
-  run_and_verify_svn(None,
-                     verify.UnorderedOutput(['D         ' + C + '\n',
+  run_and_verify_svn(verify.UnorderedOutput(['D         ' + C + '\n',
                                              'D         ' + dir + '\n',
                                              'D         ' + file + '\n']),
                      [], 'delete', C, '--force')
@@ -864,11 +861,9 @@ def force_del_tc_is_target(sbox):
   main.run_svn(None, 'update', '-r2', wc_dir)
 
   # Set a meaningless prop on each dir and file
-  run_and_verify_svn(None,
-                     ["property 'propname' set on '" + dir + "'\n"],
+  run_and_verify_svn(["property 'propname' set on '" + dir + "'\n"],
                      [], 'ps', 'propname', 'propval', dir)
-  run_and_verify_svn(None,
-                     ["property 'propname' set on '" + file + "'\n"],
+  run_and_verify_svn(["property 'propname' set on '" + file + "'\n"],
                      [], 'ps', 'propname', 'propval', file)
 
   # Update WC to HEAD, tree conflicts result dir and file
@@ -896,8 +891,7 @@ def force_del_tc_is_target(sbox):
                         wc_dir)
 
   # Delete nodes with --force, in effect disarming the tree-conflicts.
-  run_and_verify_svn(None,
-                     ['D         ' + dir + '\n',
+  run_and_verify_svn(['D         ' + dir + '\n',
                       'D         ' + file + '\n'],
                      [],
                      'delete', dir, file, '--force')
@@ -944,8 +938,7 @@ def query_absent_tree_conflicted_dir(sbo
   main.run_svn(None, 'update', '-r2', wc_dir)
 
   # Set a meaningless prop on A/C/C
-  run_and_verify_svn(None,
-                     ["property 'propname' set on '" + C_C_path + "'\n"],
+  run_and_verify_svn(["property 'propname' set on '" + C_C_path + "'\n"],
                      [], 'ps', 'propname', 'propval', C_C_path)
 
   # Update WC to HEAD, a tree conflict results on A/C/C because of the
@@ -967,8 +960,7 @@ def query_absent_tree_conflicted_dir(sbo
                         wc_dir)
 
   # Delete A/C with --keep-local.
-  run_and_verify_svn(None,
-                     verify.UnorderedOutput(['D         ' + C_C_path + '\n',
+  run_and_verify_svn(verify.UnorderedOutput(['D         ' + C_C_path + '\n',
                                              'D         ' + C_path + '\n']),
                      [],
                      'delete', C_path, '--keep-local')
@@ -995,7 +987,7 @@ def query_absent_tree_conflicted_dir(sbo
   run_and_verify_status(C_C_path, expected_output)
 
   # using info:
-  run_and_verify_svn(None, None, ".*W155010.*The node.*was not found.*",
+  run_and_verify_svn(None, ".*W155010.*The node.*was not found.*",
                      'info', C_C_path)
 
 #----------------------------------------------------------------------
@@ -1007,7 +999,7 @@ def up_add_onto_add_revert(sbox):
   sbox.build()
   wc_dir = sbox.wc_dir
   wc2_dir = sbox.add_wc_path('wc2')
-  svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+  svntest.actions.run_and_verify_svn(None, [], 'checkout',
                                      sbox.repo_url, wc2_dir)
 
   file1 = os.path.join(wc_dir, 'newfile')
@@ -1079,12 +1071,12 @@ def lock_update_only(sbox):
   file_path_b = os.path.join(wc_b, fname)
 
   # Lock a file as wc_author, and schedule the file for deletion.
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', file_path)
   svntest.main.run_svn(None, 'delete', file_path)
 
   # In our other working copy, steal that lock.
-  svntest.actions.run_and_verify_svn(None, ".*locked by user", [], 'lock',
+  svntest.actions.run_and_verify_svn(".*locked by user", [], 'lock',
                                      '-m', '', '--force', file_path)
 
   # Now update the first working copy.  It should appear as a no-op.
@@ -1170,45 +1162,45 @@ def actual_only_node_behaviour(sbox):
   # add
   expected_stdout = None
   expected_stderr = ".*foo.*is an existing item in conflict.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "add", foo_path)
 
   # add (with an existing obstruction of foo)
   svntest.main.file_write(foo_path, "This is an obstruction of foo.\n")
   expected_stdout = None
   expected_stderr = ".*foo.*is an existing item in conflict.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "add", foo_path)
   os.remove(foo_path) # remove obstruction
 
   # blame (praise, annotate, ann)
   expected_stdout = None
   expected_stderr = ".*foo.*not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "blame", foo_path)
 
   # cat
   expected_stdout = None
   expected_stderr = ".*foo.*not under version control.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "cat", foo_path)
 
   # cat -rBASE
   expected_stdout = None
   expected_stderr = ".*foo.*not under version control.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "cat", "-r", "BASE", foo_path)
   # changelist (cl)
   expected_stdout = None
   expected_stderr = ".*svn: warning: W155010: The node '.*foo' was not found."
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "changelist", "my_changelist", foo_path)
 
   # checkout (co)
   ### this does not error out -- needs review
   expected_stdout = None
   expected_stderr = []
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "checkout", A_copy_url, foo_path)
   ### for now, ignore the fact that checkout succeeds and remove the nested
   ### working copy so we can test more commands
@@ -1220,39 +1212,39 @@ def actual_only_node_behaviour(sbox):
   # cleanup
   expected_stdout = None
   expected_stderr = ".*foo.*is not a working copy directory"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "cleanup", foo_path)
   # commit (ci)
   expected_stdout = None
   expected_stderr = ".*foo.*remains in conflict.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "commit", foo_path)
   # copy (cp)
   expected_stdout = None
   expected_stderr = ".*foo.*does not exist.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "copy", foo_path, foo_path + ".copy")
 
   # delete (del, remove, rm)
   expected_stdout = None
   expected_stderr = ".*foo.*is not under version control.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "delete", foo_path)
 
   # diff (di)
   expected_stdout = None
   expected_stderr = ".*E155.*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "diff", foo_path)
   # export
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "export", foo_path, sbox.get_tempname())
   # import
   expected_stdout = None
   expected_stderr = ".*(foo.*does not exist|Can't stat.*foo).*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "import", '-m', svntest.main.make_log_msg(),
                      foo_path, sbox.repo_url + '/foo_imported')
 
@@ -1269,42 +1261,42 @@ def actual_only_node_behaviour(sbox):
   # list (ls)
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "list", foo_path)
 
   # lock
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "lock", foo_path)
   # log
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "log", foo_path)
   # merge
   # note: this is intentionally a no-op merge that does not record mergeinfo
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "merge", '--ignore-ancestry', '-c', '4',
                      A_copy_url + '/mu', foo_path)
 
   # mergeinfo
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "mergeinfo", A_copy_url + '/foo', foo_path)
   # mkdir
   expected_stdout = None
   expected_stderr = ".*foo.*is an existing item in conflict.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "mkdir", foo_path)
 
   # move (mv, rename, ren)
   expected_stdout = None
   expected_stderr = ".*foo.*does not exist.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "move", foo_path, foo_path + ".moved")
   # patch
   expected_stdout = None
@@ -1321,43 +1313,43 @@ def actual_only_node_behaviour(sbox):
   for line in patch_data:
     f.write(line)
   f.close()
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "patch", patch_path, sbox.ospath("A/foo"))
 
   # propdel (pdel, pd)
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "propdel", "svn:eol-style", foo_path)
 
   # propget (pget, pg)
   expected_stdout = None
   expected_stderr = ".*foo.*is not under version control.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "propget", "svn:eol-style", foo_path)
 
   # proplist (plist, pl)
   expected_stdout = None
   expected_stderr = ".*foo.*is not under version control.*"
-  svntest.actions.run_and_verify_svn(None, expected_stdout, expected_stderr,
+  svntest.actions.run_and_verify_svn(expected_stdout, expected_stderr,
                                      "proplist", foo_path)
 
   # propset (pset, ps)
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "propset", "svn:eol-style", "native", foo_path)
 
   # relocate
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "relocate", A_copy_url + "/foo", foo_path)
 
   # resolve
   expected_stdout = "Resolved conflicted state of.*foo.*"
   expected_stderr = []
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "resolve", "--accept", "working", foo_path)
 
   # revert the entire working copy and repeat the merge so we can test
@@ -1369,7 +1361,7 @@ def actual_only_node_behaviour(sbox):
   # revert
   expected_stdout = "Reverted.*foo.*"
   expected_stderr = []
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "revert", foo_path)
 
   # revert the entire working copy and repeat the merge so we can test
@@ -1381,7 +1373,7 @@ def actual_only_node_behaviour(sbox):
   # revert
   expected_stdout = "Reverted.*foo.*"
   expected_stderr = []
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "revert", "-R", foo_path)
 
   # revert the entire working copy and repeat the merge so we can test
@@ -1399,13 +1391,13 @@ def actual_only_node_behaviour(sbox):
   # switch (sw)
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "switch", A_copy_url + "/foo", foo_path)
 
   # unlock
   expected_stdout = None
   expected_stderr = ".*foo.*was not found.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "unlock", foo_path)
 
   # update (up)
@@ -1415,13 +1407,13 @@ def actual_only_node_behaviour(sbox):
   expected_stdout = [
    "Updating '" + foo_path + "':\n", "At revision 4.\n"]
   expected_stderr = []
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "update", foo_path)
 
   # upgrade
   expected_stdout = None
   expected_stderr = ".*Can't upgrade.*foo.*"
-  run_and_verify_svn(None, expected_stdout, expected_stderr,
+  run_and_verify_svn(expected_stdout, expected_stderr,
                      "upgrade", foo_path)
 
 #----------------------------------------------------------------------
@@ -1445,16 +1437,16 @@ def update_dir_with_not_present(sbox):
   sbox.simple_rm('A/B')
 
   # We can't commit this without updating (ra_svn produces its own error)
-  run_and_verify_svn(None, None,
+  run_and_verify_svn(None,
                     "svn: (E155011|E160028|E170004): (Dir|Item).*B.*out of date",
                      'ci', '-m', '', wc_dir)
 
   # So we run update
-  run_and_verify_svn(None, None, [],
+  run_and_verify_svn(None, [],
                      'up', wc_dir)
 
   # And now we can commit
-  run_and_verify_svn(None, None, [],
+  run_and_verify_svn(None, [],
                      'ci', '-m', '', wc_dir)
 
 @XFail()



Mime
View raw message