[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] stderr was being ignored by many regression tests

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: 2005-09-05 23:33:24 CEST

This patch tightens up many tests that were accidentally ignoring stderr, and
makes it impossible for them to do so again in the same way.

I don't expect a reviewer to check every single instance that I've fixed - I
took reasonable care - but a look at the modifications to the functions
run_and_verify_svn*() would be appreciated.

- Julian

Correct an accidental lack of checking in the regression tests. The expected
stderr was often specified as "None" (meaning ignore it) where "[]" (meaning
no output) was intended, so the tests were not as strict as they should be.

Prevent this particular case from happening again by disallowing "None" as the
"expected_stderr" argument of the two functions involved, since its meaning
was too confusing and that facility doesn't appear to be needed. If it is
needed in future, it should be handled by something similar to "SVNAnyOutput".

* subversion/tests/clients/cmdline/svntest/actions.py
  (run_and_verify_svnversion, run_and_verify_svn): Raise an exception if
    "expected_stderr" is "None".

* subversion/tests/clients/cmdline/basic_tests.py
* subversion/tests/clients/cmdline/cat_tests.py
* subversion/tests/clients/cmdline/commit_tests.py
* subversion/tests/clients/cmdline/copy_tests.py
* subversion/tests/clients/cmdline/diff_tests.py
* subversion/tests/clients/cmdline/history_tests.py
* subversion/tests/clients/cmdline/import_tests.py
* subversion/tests/clients/cmdline/lock_tests.py
* subversion/tests/clients/cmdline/merge_tests.py
* subversion/tests/clients/cmdline/prop_tests.py
* subversion/tests/clients/cmdline/revert_tests.py
* subversion/tests/clients/cmdline/svnversion_tests.py
* subversion/tests/clients/cmdline/trans_tests.py
* subversion/tests/clients/cmdline/update_tests.py
* subversion/tests/clients/cmdline/utf8_tests.py
  Pass "[]" instead of "None" for "expected_stderr" in calls to
    run_and_verify_svnversion() and run_and_verify_svn().

Index: subversion/tests/clients/cmdline/svntest/actions.py
===================================================================
--- subversion/tests/clients/cmdline/svntest/actions.py (revision 16053)
+++ subversion/tests/clients/cmdline/svntest/actions.py (working copy)
@@ -151,7 +151,7 @@ def run_and_verify_svnversion(message, w
     if len(err) == 0:
       if message is not None: print message
       raise SVNExpectedStderr
- elif expected_stderr is not None:
+ else:
     raise SVNIncorrectDatatype("Unexpected specification for stderr data")
   return out, err
   
@@ -166,10 +166,15 @@ def run_and_verify_svn(message, expected
      - If it is a single string, invoke match_or_fail() on MESSAGE,
        the expected output, and the actual output.
 
- - If it is None, do nothing with it.
+ If EXPECTED_STDOUT is None, do not check stdout.
+ EXPECTED_STDERR may not be None.
 
   If a comparison function fails, it will raise an error."""
   ### TODO catch and throw particular exceptions from above
+
+ if expected_stderr is None:
+ raise SVNIncorrectDatatype("expected_stderr must not be None")
+
   want_err = None
   if expected_stderr is not None and expected_stderr is not []:
     want_err = 1
Index: subversion/tests/clients/cmdline/basic_tests.py
===================================================================
--- subversion/tests/clients/cmdline/basic_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/basic_tests.py (working copy)
@@ -1086,7 +1086,7 @@ def basic_delete(sbox):
   iota_URL = svntest.main.current_repo_url + '/iota'
 
   svntest.actions.run_and_verify_svn(None,
- ["\n", "Committed revision 2.\n"], None,
+ ["\n", "Committed revision 2.\n"], [],
                                      'rm', '-m', 'delete iota URL',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
@@ -1265,7 +1265,7 @@ def basic_cat(sbox):
   # Get repository text even if wc is modified
   svntest.main.file_append(mu_path, "some text")
   svntest.actions.run_and_verify_svn(None, ["This is the file 'mu'.\n"],
- None, 'cat',
+ [], 'cat',
                                      ###TODO is user/pass really necessary?
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
@@ -1288,7 +1288,7 @@ def basic_ls(sbox):
     os.chdir(wc_dir)
     svntest.actions.run_and_verify_svn("ls implicit current directory",
                                        ["A/\n", "iota\n"],
- None, 'ls',
+ [], 'ls',
                                        '--username', svntest.main.wc_author,
                                        '--password', svntest.main.wc_passwd)
   finally:
@@ -1296,28 +1296,28 @@ def basic_ls(sbox):
 
   svntest.actions.run_and_verify_svn('ls the root of working copy',
                                      ['A/\n', 'iota\n'],
- None, 'ls',
+ [], 'ls',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      wc_dir)
 
   svntest.actions.run_and_verify_svn('ls a working copy directory',
                                      ['B/\n', 'C/\n', 'D/\n', 'mu\n'],
- None, 'ls',
+ [], 'ls',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      os.path.join(wc_dir, 'A'))
 
   svntest.actions.run_and_verify_svn('ls working copy directory with -r BASE',
                                      ['B/\n', 'C/\n', 'D/\n', 'mu\n'],
- None, 'ls', '-r', 'BASE',
+ [], 'ls', '-r', 'BASE',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      os.path.join(wc_dir, 'A'))
 
   svntest.actions.run_and_verify_svn('ls a single file',
                                      ['mu\n'],
- None, 'ls',
+ [], 'ls',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      os.path.join(wc_dir, 'A', 'mu'))
@@ -1427,7 +1427,7 @@ def basic_add_ignores(sbox):
   open(foo_o_path, 'w')
 
   output, err = svntest.actions.run_and_verify_svn(
- "No output where some expected", SVNAnyOutput, None,
+ "No output where some expected", SVNAnyOutput, [],
     'add', dir_path)
 
   for line in output:
@@ -1479,7 +1479,7 @@ def basic_add_no_ignores(sbox):
   open(foo_rej_path, 'w')
 
   output, err = svntest.actions.run_and_verify_svn(
- "No output where some expected", SVNAnyOutput, None,
+ "No output where some expected", SVNAnyOutput, [],
     'add', '--no-ignore', dir_path)
 
   for line in output:
@@ -1603,9 +1603,9 @@ def basic_peg_revision(sbox):
     None, None, ".*Syntax error parsing revision 'abc'", 'cat', url)
 
   # With the trailing "@", expect success.
- output, errlines = svntest.actions.run_and_verify_svn(None, ["xyz\n"], None,
+ output, errlines = svntest.actions.run_and_verify_svn(None, ["xyz\n"], [],
                                                         'cat', wc_file+'@')
- output, errlines = svntest.actions.run_and_verify_svn(None, ["xyz\n"], None,
+ output, errlines = svntest.actions.run_and_verify_svn(None, ["xyz\n"], [],
                                                         'cat', url+'@')
 
 
Index: subversion/tests/clients/cmdline/cat_tests.py
===================================================================
--- subversion/tests/clients/cmdline/cat_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/cat_tests.py (working copy)
@@ -117,7 +117,7 @@ def cat_skip_uncattable(sbox):
     else:
       svntest.actions.run_and_verify_svn(None,
                                          ["This is the file '"+file+"'.\n"],
- None, 'cat', item_to_cat)
+ [], 'cat', item_to_cat)
 
   G_path = os.path.join(dir_path, 'G')
   rho_path = os.path.join(G_path, 'rho')
Index: subversion/tests/clients/cmdline/commit_tests.py
===================================================================
--- subversion/tests/clients/cmdline/commit_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/commit_tests.py (working copy)
@@ -891,7 +891,7 @@ def hook_test(sbox):
   expected_output = [abs_repo_dir + "\n",
                      abs_repo_dir + " 1\n",
                      abs_repo_dir + " 2\n"]
- svntest.actions.run_and_verify_svn (None, expected_output, None,
+ svntest.actions.run_and_verify_svn (None, expected_output, [],
                                       'ci', '--quiet',
                                       '-m', 'log msg', wc_dir)
 
@@ -1228,7 +1228,7 @@ def commit_rmd_and_deleted_file(sbox):
 
   # Commit, hoping to see no errors
   svntest.actions.run_and_verify_svn("Output on stderr where none expected",
- SVNAnyOutput, None,
+ SVNAnyOutput, [],
                                      'commit', '-m', 'logmsg', mu_path)
 
 #----------------------------------------------------------------------
@@ -1351,7 +1351,7 @@ def commit_with_lock(sbox):
                                            
   # unlock directory
   svntest.actions.run_and_verify_svn("Output on stderr where none expected",
- [], None,
+ [], [],
                                      'cleanup', D_path)
 
   # this commit should succeed
@@ -1427,7 +1427,7 @@ def failed_commit(sbox):
 
   # Commit both working copies. The second commit should fail.
   svntest.actions.run_and_verify_svn("Output on stderr where none expected",
- SVNAnyOutput, None,
+ SVNAnyOutput, [],
                                      'commit', '-m', 'log', wc_dir)
 
   svntest.actions.run_and_verify_svn("Output on stderr expected",
@@ -1535,7 +1535,7 @@ def commit_nonrecursive(sbox):
   svntest.main.file_append(os.path.join(wc_dir, file4_path), 'this is file4')
 
   # Add them to version control.
- svntest.actions.run_and_verify_svn("", SVNAnyOutput, None,
+ svntest.actions.run_and_verify_svn("", SVNAnyOutput, [],
                                      'add', '-N',
                                      os.path.join(wc_dir, file1_path),
                                      os.path.join(wc_dir, dir1_path),
@@ -1636,7 +1636,7 @@ def commit_nonrecursive(sbox):
   svntest.main.file_append(os.path.join(wc_dir, nocommit_path), 'nocommit')
 
   # Add them to version control.
- svntest.actions.run_and_verify_svn("", SVNAnyOutput, None,
+ svntest.actions.run_and_verify_svn("", SVNAnyOutput, [],
                                      'add', '-N',
                                      os.path.join(wc_dir, dirA_path),
                                      os.path.join(wc_dir, fileA_path),
@@ -1804,7 +1804,7 @@ def from_wc_top_with_bad_editor(sbox):
   wc_dir = sbox.wc_dir
   
   svntest.actions.run_and_verify_svn("Unexpected failure from propset.",
- SVNAnyOutput, None,
+ SVNAnyOutput, [],
                                      'pset', 'fish', 'food', wc_dir)
   was_cwd = os.getcwd()
   try:
Index: subversion/tests/clients/cmdline/copy_tests.py
===================================================================
--- subversion/tests/clients/cmdline/copy_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/copy_tests.py (working copy)
@@ -1506,10 +1506,10 @@ def non_existent_url_to_url(sbox):
   pi_url = svntest.main.current_repo_url + '/A/D/G/pi'
   new_url = svntest.main.current_repo_url + '/newfile'
 
- svntest.actions.run_and_verify_svn(None, None, None, 'delete',
+ svntest.actions.run_and_verify_svn(None, None, [], 'delete',
                                      adg_url, '-m', '')
 
- svntest.actions.run_and_verify_svn(None, None, None, 'copy',
+ svntest.actions.run_and_verify_svn(None, None, [], 'copy',
                                      '-r', '1', pi_url, new_url,
                                      '-m', '')
 
@@ -1525,17 +1525,17 @@ def old_dir_url_to_url(sbox):
   new_url = svntest.main.current_repo_url + '/newfile'
 
   # Delete a directory
- svntest.actions.run_and_verify_svn(None, None, None, 'delete',
+ svntest.actions.run_and_verify_svn(None, None, [], 'delete',
                                      adg_url, '-m', '')
 
   # Copy a file to where the directory used to be
- svntest.actions.run_and_verify_svn(None, None, None, 'copy',
+ svntest.actions.run_and_verify_svn(None, None, [], 'copy',
                                      iota_url, adg_url,
                                      '-m', '')
 
   # Try copying a file that was in the deleted directory that is now a
   # file
- svntest.actions.run_and_verify_svn(None, None, None, 'copy',
+ svntest.actions.run_and_verify_svn(None, None, [], 'copy',
                                      '-r', '1', pi_url, new_url,
                                      '-m', '')
 
@@ -1555,7 +1555,7 @@ def wc_copy_dir_to_itself(sbox):
     dir_path = os.path.join(sbox.wc_dir, dirname)
 
     # try to copy dir to itself
- svntest.actions.run_and_verify_svn(None, svntest.SVNAnyOutput, None,
+ svntest.actions.run_and_verify_svn(None, svntest.SVNAnyOutput, [],
                                        'copy', dir_path, dir_path)
 
 
Index: subversion/tests/clients/cmdline/diff_tests.py
===================================================================
--- subversion/tests/clients/cmdline/diff_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/diff_tests.py (working copy)
@@ -814,7 +814,7 @@ def diff_head_of_moved_file(sbox):
   # Modify the file to ensure that the diff is non-empty.
   svntest.main.file_append(new_mu_path, "\nActually, it's a new mu.")
 
- svntest.actions.run_and_verify_svn(None, SVNAnyOutput, None,
+ svntest.actions.run_and_verify_svn(None, SVNAnyOutput, [],
                                      'diff', '-r', 'HEAD', new_mu_path)
 
 
Index: subversion/tests/clients/cmdline/history_tests.py
===================================================================
--- subversion/tests/clients/cmdline/history_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/history_tests.py (working copy)
@@ -70,7 +70,7 @@ def cat_traces_renames(sbox):
 
   # svn cat -r1 rho --> should show pi's contents.
   svntest.actions.run_and_verify_svn (None,
- [ "This is the file 'pi'.\n"], None,
+ [ "This is the file 'pi'.\n"], [],
                                       'cat', '-r', '1', rho_path)
   
   expected_output = svntest.wc.State(wc_dir, {
@@ -110,17 +110,17 @@ def cat_traces_renames(sbox):
 
   # 'svn cat bloo' --> should show rho's contents.
   svntest.actions.run_and_verify_svn (None,
- [ "This is the file 'rho'.\n"], None,
+ [ "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"], None,
+ [ "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"], None,
+ [ "This is the file 'pi'.\n"], [],
                                       'cat', '-r', '1', rho_path)
   
   # svn up -r1
Index: subversion/tests/clients/cmdline/import_tests.py
===================================================================
--- subversion/tests/clients/cmdline/import_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/import_tests.py (working copy)
@@ -276,7 +276,7 @@ def import_avoid_empty_revision(sbox):
   os.makedirs(empty_dir)
 
   url = svntest.main.current_repo_url
- svntest.actions.run_and_verify_svn(None, None, None, 'import',
+ svntest.actions.run_and_verify_svn(None, None, [], 'import',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', 'Log message for new import',
@@ -286,7 +286,7 @@ def import_avoid_empty_revision(sbox):
 
   # Verify that an empty revision has not been created
   svntest.actions.run_and_verify_svn(None, [ "At revision 1.\n"],
- None, "update",
+ [], "update",
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      empty_dir)
Index: subversion/tests/clients/cmdline/lock_tests.py
===================================================================
--- subversion/tests/clients/cmdline/lock_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/lock_tests.py (working copy)
@@ -60,7 +60,7 @@ def lock_file(sbox):
                        '--username', svntest.main.wc_author,
                        '--password', svntest.main.wc_passwd,
                        '-m', '', file_path)
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', file_path)
@@ -118,7 +118,7 @@ def commit_file_keep_lock(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
 
   # lock fname as wc_author
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', 'some lock comment', file_path)
@@ -146,7 +146,7 @@ def commit_file_unlock(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
 
   # lock fname as wc_author
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', 'some lock comment', file_path)
@@ -173,7 +173,7 @@ def commit_propchange(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
 
   # lock fname as wc_author
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', 'some lock comment', file_path)
@@ -214,7 +214,7 @@ def break_lock(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
   file_path_b = os.path.join(wc_b, fname)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', file_path)
@@ -232,7 +232,7 @@ def break_lock(sbox):
                                      '--password', svntest.main.wc_passwd,
                                      file_path_b)
 
- svntest.actions.run_and_verify_svn(None, None, None,
+ svntest.actions.run_and_verify_svn(None, None, [],
                                      'unlock', '--force',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
@@ -263,7 +263,7 @@ def steal_lock(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
   file_path_b = os.path.join(wc_b, fname)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', file_path)
@@ -281,7 +281,7 @@ def steal_lock(sbox):
                                      '--password', svntest.main.wc_passwd,
                                      '-m', 'trying to break', file_path_b)
 
- svntest.actions.run_and_verify_svn(None, None, None,
+ svntest.actions.run_and_verify_svn(None, None, [],
                                      'lock', '--force',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
@@ -301,7 +301,7 @@ def examine_lock(sbox):
   file_path = os.path.join(sbox.wc_dir, fname)
 
   # lock a file as wc_author
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', comment, file_path)
@@ -337,7 +337,7 @@ def handle_defunct_lock(sbox):
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
 
   # lock the file
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', file_path)
@@ -350,7 +350,7 @@ def handle_defunct_lock(sbox):
   # --- Meanwhile, in our other working copy... ---
 
   # Try unlocking the file in the second wc.
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      file_path_b)
@@ -405,7 +405,7 @@ def enforce_lock(sbox):
       raise svntest.Failure
 
     # obtain a lock on one of these files...
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                        '--username', svntest.main.wc_author,
                                        '--password', svntest.main.wc_passwd,
                                        '-m', '', iota_path)
@@ -416,7 +416,7 @@ def enforce_lock(sbox):
       raise svntest.Failure
 
     # ...and unlock it...
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                        '--username', svntest.main.wc_author,
                                        '--password', svntest.main.wc_passwd,
                                        iota_path)
@@ -448,7 +448,7 @@ def update_while_needing_lock(sbox):
   svntest.main.run_svn(None, 'up', wc_dir)
 
   # Lock, modify, commit, unlock, to create r3.
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', iota_path)
@@ -492,14 +492,14 @@ def defunct_lock(sbox):
   svntest.main.run_svn(None, 'update', wc_b)
 
   # lock iota in wc_b
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', iota_path_b)
 
 
   # break the lock iota in wc a
- svntest.actions.run_and_verify_svn(None, None, None, 'lock', '--force',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock', '--force',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', iota_path)
@@ -525,21 +525,21 @@ def deleted_path_lock(sbox):
   iota_path = os.path.join(wc_dir, 'iota')
   iota_url = svntest.main.current_repo_url + '/iota'
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', iota_path)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'delete', iota_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'delete', iota_path)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'commit',
+ svntest.actions.run_and_verify_svn(None, None, [], 'commit',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '--no-unlock',
                                      '-m', '', iota_path)
 
   # Now make sure that we can delete the lock from iota via a URL
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      iota_url)
@@ -561,7 +561,7 @@ def lock_unlock(sbox):
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', writelocked='K')
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', pi_path, rho_path, tau_path)
@@ -570,7 +570,7 @@ def lock_unlock(sbox):
 
   expected_status.tweak('A/D/G/pi', 'A/D/G/rho', 'A/D/G/tau', writelocked=None)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      pi_path, rho_path, tau_path)
@@ -590,14 +590,14 @@ def deleted_dir_lock(sbox):
   rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
   tau_path = os.path.join(wc_dir, 'A', 'D', 'G', 'tau')
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', pi_path, rho_path, tau_path)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'delete', parent_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'delete', parent_dir)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'commit',
+ svntest.actions.run_and_verify_svn(None, None, [], 'commit',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '--no-unlock',
@@ -809,11 +809,11 @@ def revert_lock(sbox):
   mode = stat.S_IWGRP | stat.S_IWOTH | stat.S_IWRITE
 
   # set the prop in wc
- svntest.actions.run_and_verify_svn(None, None, None, 'propset',
+ svntest.actions.run_and_verify_svn(None, None, [], 'propset',
                                   'svn:needs-lock', 'foo', iota_path)
 
   # commit r2
- svntest.actions.run_and_verify_svn(None, None, None, 'commit',
+ svntest.actions.run_and_verify_svn(None, None, [], 'commit',
                        '--username', svntest.main.wc_author,
                        '--password', svntest.main.wc_passwd,
                        '-m', '', iota_path)
@@ -831,7 +831,7 @@ def revert_lock(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # remove read-only-ness
- svntest.actions.run_and_verify_svn(None, None, None, 'propdel',
+ svntest.actions.run_and_verify_svn(None, None, [], 'propdel',
                                   'svn:needs-lock', iota_path)
 
   # make sure that iota got read-only-ness removed
@@ -841,7 +841,7 @@ def revert_lock(sbox):
     raise svntest.Failure
   
   # revert the change
- svntest.actions.run_and_verify_svn(None, None, None, 'revert', iota_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'revert', iota_path)
 
   # make sure that iota got set back to read-only
   if (os.stat (iota_path)[0] & mode):
@@ -854,7 +854,7 @@ def revert_lock(sbox):
   extra_name = 'xx'
 
   # now lock the file
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                        '--username', svntest.main.wc_author,
                        '--password', svntest.main.wc_passwd,
                        '-m', '', iota_path)
@@ -868,7 +868,7 @@ def revert_lock(sbox):
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
   
   # revert it
- svntest.actions.run_and_verify_svn(None, None, None, 'revert', iota_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'revert', iota_path)
 
   # make sure it is still writable since we have the lock
   if (os.stat (iota_path)[0] & mode == 0):
@@ -890,13 +890,13 @@ def examine_lock_via_url(sbox):
   file_url = svntest.main.current_repo_url + '/' + fname
 
   # lock a file as wc_author
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author2,
                                      '--password', svntest.main.wc_passwd,
                                      '--no-auth-cache',
                                      '-m', comment, file_path)
 
- output, err = svntest.actions.run_and_verify_svn(None, None, None, 'info',
+ output, err = svntest.actions.run_and_verify_svn(None, None, [], 'info',
                                                    file_url)
 
   match_line = 'Lock Owner: ' + svntest.main.wc_author2 + '\n'
@@ -917,7 +917,7 @@ def lock_several_files(sbox):
   lambda_path = os.path.join(sbox.wc_dir, 'A', 'B', 'lambda')
   alpha_path = os.path.join(sbox.wc_dir, 'A', 'B', 'E', 'alpha')
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author2,
                                      '--password', svntest.main.wc_passwd,
                                      '--no-auth-cache',
@@ -928,7 +928,7 @@ def lock_several_files(sbox):
   expected_status.tweak('iota', 'A/B/lambda', 'A/B/E/alpha', writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author2,
                                      '--password', svntest.main.wc_passwd,
                                      '--no-auth-cache',
@@ -949,16 +949,16 @@ def lock_switched_files(sbox):
   iota_URL = svntest.main.current_repo_url + '/iota'
   alpha_URL = svntest.main.current_repo_url + '/A/B/E/alpha'
 
- svntest.actions.run_and_verify_svn(None, None, None, 'switch',
+ svntest.actions.run_and_verify_svn(None, None, [], 'switch',
                                      iota_URL, gamma_path)
- svntest.actions.run_and_verify_svn(None, None, None, 'switch',
+ svntest.actions.run_and_verify_svn(None, None, [], 'switch',
                                      alpha_URL, lambda_path)
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/D/gamma', 'A/B/lambda', switched='S')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '--no-auth-cache',
@@ -969,7 +969,7 @@ def lock_switched_files(sbox):
   expected_status.tweak('A/B/E/alpha', 'iota', writelocked='O')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '--no-auth-cache',
@@ -990,7 +990,7 @@ def lock_uri_encoded(sbox):
   file_path = os.path.join(wc_dir, fname)
 
   svntest.main.file_append(file_path, "This represents a binary file\n")
- svntest.actions.run_and_verify_svn(None, None, None, "add", file_path)
+ svntest.actions.run_and_verify_svn(None, None, [], "add", file_path)
 
   expected_output = svntest.wc.State(wc_dir, {
     fname : Item(verb='Adding'),
@@ -1008,7 +1008,7 @@ def lock_uri_encoded(sbox):
                                         None, None,
                                         file_path)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', file_path)
@@ -1017,7 +1017,7 @@ def lock_uri_encoded(sbox):
   expected_status.tweak(fname, writelocked='K')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      file_path)
@@ -1028,7 +1028,7 @@ def lock_uri_encoded(sbox):
 
   # And now the URL case.
   file_url = svntest.main.current_repo_url + '/' + fname
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', file_url)
@@ -1037,7 +1037,7 @@ def lock_uri_encoded(sbox):
   expected_status.tweak(fname, writelocked='O')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      file_url)
@@ -1062,14 +1062,14 @@ def lock_and_exebit1(sbox):
 
   gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
   
- svntest.actions.run_and_verify_svn(None, None, None, 'ps',
+ svntest.actions.run_and_verify_svn(None, None, [], 'ps',
                                      'svn:needs-lock', ' ', gamma_path)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'ps',
+ svntest.actions.run_and_verify_svn(None, None, [], 'ps',
                                      'svn:executable', ' ', gamma_path)
   
   # commit
- svntest.actions.run_and_verify_svn(None, None, None, 'commit',
+ svntest.actions.run_and_verify_svn(None, None, [], 'commit',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', gamma_path)
@@ -1083,7 +1083,7 @@ def lock_and_exebit1(sbox):
     raise svntest.Failure
 
   # lock
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', gamma_path)
@@ -1100,7 +1100,7 @@ def lock_and_exebit1(sbox):
   svntest.main.file_append(gamma_path, "check stat output after mod & unlock")
   
   # unlock
- svntest.actions.run_and_verify_svn(None, None, None, 'unlock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'unlock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      gamma_path)
@@ -1115,7 +1115,7 @@ def lock_and_exebit1(sbox):
     raise svntest.Failure
   
   # ci
- svntest.actions.run_and_verify_svn(None, None, None, 'commit',
+ svntest.actions.run_and_verify_svn(None, None, [], 'commit',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', gamma_path)
@@ -1144,14 +1144,14 @@ def lock_and_exebit2(sbox):
 
   gamma_path = os.path.join(wc_dir, 'A', 'D', 'gamma')
   
- svntest.actions.run_and_verify_svn(None, None, None, 'ps',
+ svntest.actions.run_and_verify_svn(None, None, [], 'ps',
                                      'svn:needs-lock', ' ', gamma_path)
 
- svntest.actions.run_and_verify_svn(None, None, None, 'ps',
+ svntest.actions.run_and_verify_svn(None, None, [], 'ps',
                                      'svn:executable', ' ', gamma_path)
   
   # commit
- svntest.actions.run_and_verify_svn(None, None, None, 'commit',
+ svntest.actions.run_and_verify_svn(None, None, [], 'commit',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', gamma_path)
@@ -1165,7 +1165,7 @@ def lock_and_exebit2(sbox):
     raise svntest.Failure
 
   # lock
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', gamma_path)
@@ -1182,7 +1182,7 @@ def lock_and_exebit2(sbox):
   svntest.main.file_append(gamma_path, "check stat output after mod & unlock")
   
   # commit
- svntest.actions.run_and_verify_svn(None, None, None, 'commit',
+ svntest.actions.run_and_verify_svn(None, None, [], 'commit',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', '', gamma_path)
@@ -1209,7 +1209,7 @@ def commit_xml_unsafe_file_unlock(sbox):
   svntest.main.run_svn(None, 'commit', '-m', '', file_path)
 
   # lock fname as wc_author
- svntest.actions.run_and_verify_svn(None, None, None, 'lock',
+ svntest.actions.run_and_verify_svn(None, None, [], 'lock',
                                      '--username', svntest.main.wc_author,
                                      '--password', svntest.main.wc_passwd,
                                      '-m', 'some lock comment', file_path)
Index: subversion/tests/clients/cmdline/merge_tests.py
===================================================================
--- subversion/tests/clients/cmdline/merge_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/merge_tests.py (working copy)
@@ -263,14 +263,14 @@ def textual_merges_galore(sbox):
   # whole expected_foo routine for these intermediate operations;
   # they're not what we're here to test, after all, so it's enough to
   # know that they worked. Is this a bad practice? ###
- out, err = svntest.actions.run_and_verify_svn(None, None, None,
+ out, err = svntest.actions.run_and_verify_svn(None, None, [],
                                                 'revert', other_rho_path)
   if (err):
     for line in err:
       print "Error reverting: ", line,
     raise svntest.Failure
 
- out, err = svntest.actions.run_and_verify_svn(None, None, None,
+ out, err = svntest.actions.run_and_verify_svn(None, None, [],
                                                 'up', '-r', '2',
                                                 other_rho_path)
   if (err):
@@ -2357,7 +2357,7 @@ def merge_prop_change_to_deleted_target(
   try:
     os.chdir(wc_dir)
     svntest.actions.run_and_verify_svn("Merge errored unexpectedly",
- SVNAnyOutput, None,
+ SVNAnyOutput, [],
                                        'merge', '-r1:2', '.')
   finally:
     os.chdir(saved_cwd)
Index: subversion/tests/clients/cmdline/prop_tests.py
===================================================================
--- subversion/tests/clients/cmdline/prop_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/prop_tests.py (working copy)
@@ -617,25 +617,25 @@ def inappropriate_props(sbox):
   
   path = os.path.join(wc_dir, 'binary')
   svntest.main.file_append(path, "binary")
- svntest.actions.run_and_verify_svn(None, None, None,
+ svntest.actions.run_and_verify_svn(None, None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'CRLF',
                                      path)
    
   path = os.path.join(wc_dir, 'multi-eol')
- svntest.actions.run_and_verify_svn(None, None, None,
+ svntest.actions.run_and_verify_svn(None, None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'LF',
                                      path)
     
   path = os.path.join(wc_dir, 'backwards-eol')
- svntest.actions.run_and_verify_svn(None, None, None,
+ svntest.actions.run_and_verify_svn(None, None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'native',
                                      path)
     
   path = os.path.join(wc_dir, 'incomplete-eol')
- svntest.actions.run_and_verify_svn(None, None, None,
+ svntest.actions.run_and_verify_svn(None, None, [],
                                      'propset', '--force',
                                      'svn:eol-style', 'CR',
                                      path)
Index: subversion/tests/clients/cmdline/revert_tests.py
===================================================================
--- subversion/tests/clients/cmdline/revert_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/revert_tests.py (working copy)
@@ -143,7 +143,7 @@ def revert_replaced_file_without_props(s
 
   # revert file1
   svntest.actions.run_and_verify_svn(None, ["Reverted '" + file1_path + "'\n"],
- None, 'revert', file1_path)
+ [], 'revert', file1_path)
 
   # test that file1 really was reverted
   expected_status.tweak('file1', status=' ', wc_rev=2)
@@ -171,7 +171,7 @@ def revert_moved_file(sbox):
     
     # now revert the file iota
     svntest.actions.run_and_verify_svn(None,
- ["Reverted '" + iota_path + "'\n"], None, 'revert', iota_path)
+ ["Reverted '" + iota_path + "'\n"], [], 'revert', iota_path)
     
     # at this point, svn status on iota_path_moved should return nothing
     # since it should disappear on reverting the move, and since svn status
Index: subversion/tests/clients/cmdline/svnversion_tests.py
===================================================================
--- subversion/tests/clients/cmdline/svnversion_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/svnversion_tests.py (working copy)
@@ -41,19 +41,19 @@ def svnversion_test(sbox):
   # Unmodified
   svntest.actions.run_and_verify_svnversion("Unmodified working copy",
                                             wc_dir, repo_url,
- [ "1\n" ], None)
+ [ "1\n" ], [])
 
   # Unmodified, whole wc switched
   svntest.actions.run_and_verify_svnversion("Unmodified switched working copy",
                                             wc_dir, "some/other/url",
- [ "1S\n" ], None)
+ [ "1S\n" ], [])
 
   mu_path = os.path.join(wc_dir, 'A', 'mu')
   svntest.main.file_append (mu_path, 'appended mu text')
 
   # Text modified
   svntest.actions.run_and_verify_svnversion("Modified text", wc_dir, repo_url,
- [ "1M\n" ], None)
+ [ "1M\n" ], [])
 
   expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
   expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
@@ -68,7 +68,7 @@ def svnversion_test(sbox):
   # Unmodified, mixed
   svntest.actions.run_and_verify_svnversion("Unmodified mixed working copy",
                                             wc_dir, repo_url,
- [ "1:2\n" ], None)
+ [ "1:2\n" ], [])
 
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'propset', 'blue', 'azul',
@@ -77,7 +77,7 @@ def svnversion_test(sbox):
   # Prop modified, mixed
   svntest.actions.run_and_verify_svnversion("Property modified mixed wc",
                                             wc_dir, repo_url,
- [ "1:2M\n" ], None)
+ [ "1:2M\n" ], [])
 
   iota_path = os.path.join(wc_dir, 'iota')
   gamma_url = svntest.main.current_repo_url + '/A/D/gamma'
@@ -99,21 +99,21 @@ def svnversion_test(sbox):
   # Prop modified, mixed, part wc switched
   svntest.actions.run_and_verify_svnversion("Prop-mod mixed partly switched",
                                             wc_dir, repo_url,
- [ "1:2MS\n" ], None)
+ [ "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,
- [ "exported\n" ], None)
+ [ "exported\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,
- [ "exported\n" ], None)
+ [ "exported\n" ], [])
 
   # No directory generates an error
   svntest.actions.run_and_verify_svnversion("None existent directory",
@@ -162,7 +162,7 @@ def ignore_externals(sbox):
 
   svntest.actions.run_and_verify_svnversion("working copy with svn:externals",
                                             wc_dir, repo_url,
- [ "2\n" ], None)
+ [ "2\n" ], [])
 
 ########################################################################
 # Run the tests
Index: subversion/tests/clients/cmdline/trans_tests.py
===================================================================
--- subversion/tests/clients/cmdline/trans_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/trans_tests.py (working copy)
@@ -616,7 +616,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",
- "$Rev: 2 $" ], None,
+ "$Rev: 2 $" ], [],
                                       'cat', '-r', 'HEAD', mu_path)
   
 
@@ -693,7 +693,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, None, 'checkout',
+ svntest.actions.run_and_verify_svn (None, None, [], 'checkout',
                                       '--username', svntest.main.wc_author,
                                       '--password', svntest.main.wc_passwd,
                                       svntest.main.current_repo_url,
Index: subversion/tests/clients/cmdline/update_tests.py
===================================================================
--- subversion/tests/clients/cmdline/update_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/update_tests.py (working copy)
@@ -1117,7 +1117,7 @@ def another_hudson_problem(sbox):
 
   # Delete directory G from the repository
   svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 3.\n'], None,
+ ['\n', 'Committed revision 3.\n'], [],
                                      'rm', '-m', 'log msg',
                                      svntest.main.current_repo_url + '/A/D/G')
 
@@ -1132,7 +1132,7 @@ def another_hudson_problem(sbox):
   # of issue 919 as far as I can tell)
   svntest.actions.run_and_verify_svn(None,
                                      ['D '+G_path+'\n',
- 'Updated to revision 3.\n'], None,
+ 'Updated to revision 3.\n'], [],
                                      'up', G_path)
 
   # Both G and gamma should be 'deleted', update should produce no output
@@ -1173,9 +1173,9 @@ def update_deleted_targets(sbox):
                                          wc_dir)
 
   # Explicit update must not remove the 'deleted=true' entries
- svntest.actions.run_and_verify_svn(None, ['At revision 2.\n'], None,
+ svntest.actions.run_and_verify_svn(None, ['At revision 2.\n'], [],
                                      'update', gamma_path)
- svntest.actions.run_and_verify_svn(None, ['At revision 2.\n'], None,
+ svntest.actions.run_and_verify_svn(None, ['At revision 2.\n'], [],
                                      'update', F_path)
 
   # Update to r1 to restore items, since the parent directory is already
@@ -1206,7 +1206,7 @@ def new_dir_with_spaces(sbox):
 
   # Create a new directory ("spacey dir") directly in repository
   svntest.actions.run_and_verify_svn(None,
- ['\n', 'Committed revision 2.\n'], None,
+ ['\n', 'Committed revision 2.\n'], [],
                                      'mkdir', '-m', 'log msg',
                                      svntest.main.current_repo_url
                                      + '/A/spacey%20dir')
Index: subversion/tests/clients/cmdline/utf8_tests.py
===================================================================
--- subversion/tests/clients/cmdline/utf8_tests.py (revision 16053)
+++ subversion/tests/clients/cmdline/utf8_tests.py (working copy)
@@ -118,7 +118,7 @@ else:
     localeregex = re.compile('^ISO-?8859-1$', re.I)
     localematch = localeregex.search(localeenc)
     try:
- svntest.actions.run_and_verify_svn("",svntest.SVNAnyOutput, None,"help")
+ svntest.actions.run_and_verify_svn("",svntest.SVNAnyOutput, [],"help")
     except:
       # We won't be able to run the client; this might be because the
       # system does not support the iso-8859-1 locale. Anyhow, it makes

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 5 23:34:51 2005

This is an archived mail posted to the Subversion Dev mailing list.