subversion-commits mailing list archives

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

Modified: subversion/branches/pin-externals/subversion/tests/cmdline/redirect_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/redirect_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/redirect_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/redirect_tests.py Tue Feb 10 11:41:57 2015
@@ -215,13 +215,13 @@ def redirected_copy(sbox):
   expected_error = "svn: E170011: Repository moved permanently"
 
   # This tests the actual copy handling
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'cp', '-m', 'failed copy',
                                      sbox.redirected_root_url() + '/A',
                                      sbox.redirected_root_url() + '/A_copied')
 
   # This tests the cmdline handling of '^/copy-of-A'
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'cp', '-m', 'failed copy',
                                      sbox.redirected_root_url() + '/A',
                                      '^/copy-of-A')
@@ -230,13 +230,13 @@ def redirected_copy(sbox):
   expected_error = "svn: E170011: Repository moved temporarily"
 
   # This tests the actual copy handling
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'cp', '-m', 'failed copy',
                                      sbox.redirected_root_url(temporary=True) + '/A',
                                      sbox.redirected_root_url(temporary=True) + '/A_copied')
 
   # This tests the cmdline handling of '^/copy-of-A'
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'cp', '-m', 'failed copy',
                                      sbox.redirected_root_url(temporary=True) + '/A',
                                      '^/copy-of-A')

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

Modified: subversion/branches/pin-externals/subversion/tests/cmdline/resolve_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/resolve_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/resolve_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/resolve_tests.py Tue Feb 10 11:41:57 2015
@@ -70,13 +70,12 @@ def automatic_conflict_resolution(sbox):
   # Make a change on the A_COPY branch such that a subsequent merge
   # conflicts.
   svntest.main.file_write(psi_COPY_path, "Branch content.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', 'log msg', wc_dir)
   def do_text_conflicting_merge():
-    svntest.actions.run_and_verify_svn(None, None, [],
+    svntest.actions.run_and_verify_svn(None, [],
                                        'revert', '--recursive', A_COPY_path)
     svntest.actions.run_and_verify_svn(
-      None,
       expected_merge_output([[3]], [
         "C    %s\n" % psi_COPY_path,
         " U   %s\n" % A_COPY_path],
@@ -126,10 +125,10 @@ def prop_conflict_resolution(sbox):
   psi_path   = os.path.join(wc_dir, "A", "D", "H", "psi")
 
   # r2 - Set property 'propname:propval' on iota, A/mu, and A/D/gamma.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'propname', 'propval',
                                      iota_path, mu_path, gamma_path)
-  svntest.actions.run_and_verify_svn(None, None, [], 'commit',
+  svntest.actions.run_and_verify_svn(None, [], 'commit',
                                      '-m', 'create some new properties',
                                      wc_dir)
 
@@ -138,15 +137,15 @@ def prop_conflict_resolution(sbox):
   #   iota      : Delete property 'propname'
   #   A/mu      : Change property 'propname' to 'incoming-conflict'
   #   A/D/gamma : Change property 'propname' to 'incoming-no-conflict'
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'pd', 'propname', iota_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'propname', 'incoming-conflict',
                                      mu_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'propname', 'incoming-no-conflict',
                                      gamma_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'commit', '-m', 'delete a property',
                                      wc_dir)
 
@@ -178,28 +177,28 @@ def prop_conflict_resolution(sbox):
     both follow the rules for the expected_stdout arg to
     run_and_verify_svn2()"""
 
-    svntest.actions.run_and_verify_svn(None, None, [],
+    svntest.actions.run_and_verify_svn(None, [],
                                        'revert', '--recursive', wc_dir)
-    svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r2', wc_dir)
+    svntest.actions.run_and_verify_svn(None, [], 'up', '-r2', wc_dir)
 
     # Set some properties that will conflict when we update.
-    svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+    svntest.actions.run_and_verify_svn(None, [], 'ps',
                                        'propname', 'local_edit',
                                        iota_path, mu_path)
 
     # Set a property that should always merge cleanly with the update.
-    svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+    svntest.actions.run_and_verify_svn(None, [], 'ps',
                                        'propname', 'incoming-no-conflict',
                                        gamma_path)
 
     # Set a property that has no update coming.
-    svntest.actions.run_and_verify_svn(None, None, [], 'ps',
+    svntest.actions.run_and_verify_svn(None, [], 'ps',
                                        'newprop', 'new-val-no-incoming',
                                        psi_path,
                                        iota_path)
 
     # Update, postponing all conflict resolution.
-    svntest.actions.run_and_verify_svn(None, None, [], 'up',
+    svntest.actions.run_and_verify_svn(None, [], 'up',
                                        '--accept=postpone', wc_dir)
     svntest.actions.run_and_verify_resolve([iota_path, mu_path], '-R',
                                            '--accept', resolve_accept, wc_dir)
@@ -209,25 +208,15 @@ def prop_conflict_resolution(sbox):
       expected_deleted_stderr = '.*W200017: Property.*not found'
 
     svntest.actions.run_and_verify_svn(
-      'svn revolve -R --accept=' + resolve_accept + ' of prop conflict '
-      'not resolved as expected;',
       resolved_deleted_prop_val_output, expected_deleted_stderr,
       'pg', 'propname', iota_path)
     svntest.actions.run_and_verify_svn(
-      'svn revolve -R --accept=' + resolve_accept + ' of prop conflict '
-      'not resolved as expected;',
       ['new-val-no-incoming\n'], [], 'pg', 'newprop', iota_path)
     svntest.actions.run_and_verify_svn(
-      'svn revolve -R --accept=' + resolve_accept + ' of prop conflict '
-      'not resolved as expected;',
       resolved_edited_prop_val_output, [], 'pg', 'propname', mu_path)
     svntest.actions.run_and_verify_svn(
-      'svn revolve -R --accept=' + resolve_accept + ' modified a '
-      'non-conflicted property',
       ['incoming-no-conflict\n'], [], 'pg', 'propname', gamma_path)
     svntest.actions.run_and_verify_svn(
-      'svn revolve -R --accept=' + resolve_accept + ' modified a '
-      'non-conflicted property',
       ['new-val-no-incoming\n'], [], 'pg', 'newprop', psi_path)
 
   # Test how svn resolve deals with prop conflicts and other local
@@ -300,7 +289,7 @@ def resolved_on_wc_root(sbox):
   # Commit mods
   svntest.main.file_append(i, "changed iota.\n")
   svntest.main.file_append(g, "changed gamma.\n")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'foo-val', B)
 
   expected_output = svntest.wc.State(wc, {
@@ -335,7 +324,7 @@ def resolved_on_wc_root(sbox):
 
   # Deletions so that the item becomes unversioned and
   # will have a tree-conflict upon update.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', i, B, g)
 
   # Update so that conflicts appear
@@ -391,7 +380,7 @@ def resolved_on_deleted_item(sbox):
   A2_url = sbox.repo_url + '/A2'
 
   # make a copy of A
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', A_url, A2_url, '-m', 'm')
 
   expected_output = svntest.wc.State(wc, {
@@ -467,7 +456,7 @@ def resolved_on_deleted_item(sbox):
   # Create some conflicts...
 
   # Modify the paths in the one directory.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'foo', 'foo-val', B)
   svntest.main.file_append(g, "Modified gamma.\n")
 
@@ -485,7 +474,7 @@ def resolved_on_deleted_item(sbox):
                                         wc)
 
   # Delete the paths in the second directory.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'rm', B2, g2)
 
   expected_output = svntest.wc.State(wc, {

Modified: subversion/branches/pin-externals/subversion/tests/cmdline/revert_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/tests/cmdline/revert_tests.py?rev=1658686&r1=1658685&r2=1658686&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/tests/cmdline/revert_tests.py (original)
+++ subversion/branches/pin-externals/subversion/tests/cmdline/revert_tests.py Tue Feb 10 11:41:57 2015
@@ -64,11 +64,11 @@ def revert_replacement_with_props(sbox,
   # Set props on file which is copy-source later on
   pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
   rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'phony-prop', '-F', prop_path,
                                      pi_path)
   os.remove(prop_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'svn:eol-style', 'LF', rho_path)
 
   # Verify props having been set
@@ -95,10 +95,10 @@ def revert_replacement_with_props(sbox,
                                         None, wc_dir)
 
   # Bring wc into sync
-  svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+  svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
 
   # File scheduled for deletion
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', rho_path)
 
   # Status before attempting copies
   expected_status = svntest.actions.get_virginal_state(wc_dir, 2)
@@ -111,7 +111,7 @@ def revert_replacement_with_props(sbox,
   else:
     pi_src = sbox.repo_url + '/A/D/G/pi'
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', pi_src, rho_path)
 
   # Verify both content and props have been copied
@@ -131,7 +131,7 @@ def revert_replacement_with_props(sbox,
 
   expected_status.tweak('A/D/G/rho', status='  ', copied=None, wc_rev='2')
   expected_output = ["Reverted '" + rho_path + "'\n"]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', '-R', wc_dir)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
@@ -175,18 +175,18 @@ def revert_from_wc_root(sbox):
   svntest.main.file_append(rho_path, "Added some text to 'rho'.\n")
   svntest.main.file_append(zeta_path, "Added some text to 'zeta'.\n")
 
-  svntest.actions.run_and_verify_svn("Add command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'add', zeta_path)
-  svntest.actions.run_and_verify_svn("Add prop command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'random-prop', 'propvalue',
                                      gamma_path)
-  svntest.actions.run_and_verify_svn("Add prop command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'random-prop', 'propvalue',
                                      iota_path)
-  svntest.actions.run_and_verify_svn("Add prop command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'random-prop', 'propvalue',
                                      '.')
-  svntest.actions.run_and_verify_svn("Add prop command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ps', 'random-prop', 'propvalue',
                                      'A')
 
@@ -202,25 +202,25 @@ def revert_from_wc_root(sbox):
   svntest.actions.run_and_verify_status('', expected_output)
 
   # Run revert
-  svntest.actions.run_and_verify_svn("Revert command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', beta_path)
 
-  svntest.actions.run_and_verify_svn("Revert command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', gamma_path)
 
-  svntest.actions.run_and_verify_svn("Revert command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', iota_path)
 
-  svntest.actions.run_and_verify_svn("Revert command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', rho_path)
 
-  svntest.actions.run_and_verify_svn("Revert command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', zeta_path)
 
-  svntest.actions.run_and_verify_svn("Revert command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', '.')
 
-  svntest.actions.run_and_verify_svn("Revert command", None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', 'A')
 
   # Verify unmodified status.
@@ -309,7 +309,7 @@ def revert_reexpand_keyword(sbox):
                                         '-m', "Shouldn't be committed")
 
   # Revert the file.  The file is not reverted!
-  svntest.actions.run_and_verify_svn(None, [], [], 'revert', newfile_path)
+  svntest.actions.run_and_verify_svn([], [], 'revert', newfile_path)
 
 
 #----------------------------------------------------------------------
@@ -326,7 +326,7 @@ def revert_replaced_file_without_props(s
 
   # Add a new file, file1, that has no prop-base
   svntest.main.file_append(file1_path, "This is the file 'file1' revision 2.")
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', file1_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', file1_path)
 
   # commit file1
   expected_output = svntest.wc.State(wc_dir, {
@@ -342,7 +342,7 @@ def revert_replaced_file_without_props(s
                                         expected_status, None, wc_dir)
 
   # delete file1
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', file1_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', file1_path)
 
   # test that file1 is scheduled for deletion.
   expected_status.tweak('file1', status='D ')
@@ -350,14 +350,14 @@ def revert_replaced_file_without_props(s
 
   # recreate and add file1
   svntest.main.file_append(file1_path, "This is the file 'file1' revision 3.")
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', file1_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', file1_path)
 
   # Test to see if file1 is schedule for replacement
   expected_status.tweak('file1', status='R ')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # revert file1
-  svntest.actions.run_and_verify_svn(None, ["Reverted '" + file1_path + "'\n"],
+  svntest.actions.run_and_verify_svn(["Reverted '" + file1_path + "'\n"],
                                      [], 'revert', file1_path)
 
   # test that file1 really was reverted
@@ -389,7 +389,7 @@ def revert_moved_file(sbox):
     'D         ' + iota + '\n',
   ])
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mv', iota,
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'mv', iota,
     iota_moved)
 
   # svn st
@@ -405,7 +405,7 @@ def revert_moved_file(sbox):
   # svn revert iota
   expected_stdout = ["Reverted '" + iota + "'\n"]
 
-  actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'revert',
+  actions.run_and_verify_svn2(expected_stdout, [], 0, 'revert',
     iota)
 
   # svn st
@@ -429,7 +429,7 @@ def revert_file_merge_replace_with_histo
 
   # File scheduled for deletion
   rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', rho_path)
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/D/G/rho', status='D ')
@@ -450,7 +450,7 @@ def revert_file_merge_replace_with_histo
   svntest.main.file_write(rho_path, "new rho\n")
 
   # Add the new file
-  svntest.actions.run_and_verify_svn(None, None, [], 'add', rho_path)
+  svntest.actions.run_and_verify_svn(None, [], 'add', rho_path)
 
   # Commit revsion 3
   expected_status.add({
@@ -501,7 +501,6 @@ def revert_file_merge_replace_with_histo
 
   # Now revert
   svntest.actions.run_and_verify_svn(None,
-                                     None,
                                      [], 'revert', rho_path)
 
   # test that rho really was reverted
@@ -535,7 +534,7 @@ def revert_after_second_replace(sbox):
 
   # File scheduled for deletion
   rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', rho_path)
 
   # Status before attempting copy
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -545,14 +544,14 @@ def revert_after_second_replace(sbox):
   # Replace file for the first time
   pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp', pi_src, rho_path)
 
   expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Now delete replaced file.
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--force', rho_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', '--force', rho_path)
 
   # Status should be same as after first delete
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -562,13 +561,13 @@ def revert_after_second_replace(sbox):
   # Replace file for the second time
   pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp', pi_src, rho_path)
+  svntest.actions.run_and_verify_svn(None, [], 'cp', pi_src, rho_path)
 
   expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Now revert
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', '-R', wc_dir)
 
   # Check disk status
@@ -608,9 +607,9 @@ def revert_after_manual_conflict_resolut
   os.remove(iota_path_2 + '.r2')
 
   # Verify no output from status, diff, or revert
-  svntest.actions.run_and_verify_svn(None, [], [], "status", wc_dir_2)
-  svntest.actions.run_and_verify_svn(None, [], [], "diff", wc_dir_2)
-  svntest.actions.run_and_verify_svn(None, [], [], "revert", "-R", wc_dir_2)
+  svntest.actions.run_and_verify_svn([], [], "status", wc_dir_2)
+  svntest.actions.run_and_verify_svn([], [], "diff", wc_dir_2)
+  svntest.actions.run_and_verify_svn([], [], "revert", "-R", wc_dir_2)
 
 def revert_after_manual_conflict_resolution__prop(sbox):
   "revert after manual property-conflict resolution"
@@ -636,9 +635,9 @@ def revert_after_manual_conflict_resolut
   os.remove(iota_path_2 + '.prej')
 
   # Verify no output from status, diff, or revert
-  svntest.actions.run_and_verify_svn(None, [], [], "status", wc_dir_2)
-  svntest.actions.run_and_verify_svn(None, [], [], "diff", wc_dir_2)
-  svntest.actions.run_and_verify_svn(None, [], [], "revert", "-R", wc_dir_2)
+  svntest.actions.run_and_verify_svn([], [], "status", wc_dir_2)
+  svntest.actions.run_and_verify_svn([], [], "diff", wc_dir_2)
+  svntest.actions.run_and_verify_svn([], [], "revert", "-R", wc_dir_2)
 
 def revert_propset__dir(sbox):
   "revert a simple propset on a dir"
@@ -648,7 +647,7 @@ def revert_propset__dir(sbox):
   a_path = os.path.join(wc_dir, 'A')
   svntest.main.run_svn(None, 'propset', 'foo', 'x', a_path)
   expected_output = re.escape("Reverted '" + a_path + "'")
-  svntest.actions.run_and_verify_svn(None, expected_output, [], "revert",
+  svntest.actions.run_and_verify_svn(expected_output, [], "revert",
                                      a_path)
 
 def revert_propset__file(sbox):
@@ -659,7 +658,7 @@ def revert_propset__file(sbox):
   iota_path = os.path.join(wc_dir, 'iota')
   svntest.main.run_svn(None, 'propset', 'foo', 'x', iota_path)
   expected_output = re.escape("Reverted '" + iota_path + "'")
-  svntest.actions.run_and_verify_svn(None, expected_output, [], "revert",
+  svntest.actions.run_and_verify_svn(expected_output, [], "revert",
                                      iota_path)
 
 def revert_propdel__dir(sbox):
@@ -673,7 +672,7 @@ def revert_propdel__dir(sbox):
                        'commit', '-m', 'ps', a_path)
   svntest.main.run_svn(None, 'propdel', 'foo', a_path)
   expected_output = re.escape("Reverted '" + a_path + "'")
-  svntest.actions.run_and_verify_svn(None, expected_output, [], "revert",
+  svntest.actions.run_and_verify_svn(expected_output, [], "revert",
                                      a_path)
 
 def revert_propdel__file(sbox):
@@ -687,7 +686,7 @@ def revert_propdel__file(sbox):
                        'commit', '-m', 'ps', iota_path)
   svntest.main.run_svn(None, 'propdel', 'foo', iota_path)
   expected_output = re.escape("Reverted '" + iota_path + "'")
-  svntest.actions.run_and_verify_svn(None, expected_output, [], "revert",
+  svntest.actions.run_and_verify_svn(expected_output, [], "revert",
                                      iota_path)
 
 def revert_replaced_with_history_file_1(sbox):
@@ -699,7 +698,7 @@ def revert_replaced_with_history_file_1(
   mu_path = os.path.join(wc_dir, 'A', 'mu')
 
   # Remember the original text of 'mu'
-  exit_code, text_r1, err = svntest.actions.run_and_verify_svn(None, None, [],
+  exit_code, text_r1, err = svntest.actions.run_and_verify_svn(None, [],
                                                                'cat', mu_path)
   # delete mu and replace it with a copy of iota
   svntest.main.run_svn(None, 'rm', mu_path)
@@ -759,16 +758,16 @@ def revert_replaced_with_history_file_1(
                                         None, wc_dir)
 
   # Verify the content of 'mu'
-  svntest.actions.run_and_verify_svn(None, text_r1, [], 'cat', mu_path)
+  svntest.actions.run_and_verify_svn(text_r1, [], 'cat', mu_path)
 
   # situation: no local modifications, mu has its original content again.
 
   # revert 'mu' locally, shouldn't change a thing.
-  svntest.actions.run_and_verify_svn(None, [], [], "revert",
+  svntest.actions.run_and_verify_svn([], [], "revert",
                                      mu_path)
 
   # Verify the content of 'mu'
-  svntest.actions.run_and_verify_svn(None, text_r1, [], 'cat', mu_path)
+  svntest.actions.run_and_verify_svn(text_r1, [], 'cat', mu_path)
 
 #----------------------------------------------------------------------
 # Test for issue #2804.
@@ -780,9 +779,9 @@ def status_of_missing_dir_after_revert(s
   wc_dir = sbox.wc_dir
   A_D_G_path = os.path.join(wc_dir, "A", "D", "G")
 
-  svntest.actions.run_and_verify_svn(None, None, [], "rm", A_D_G_path)
+  svntest.actions.run_and_verify_svn(None, [], "rm", A_D_G_path)
   expected_output = re.escape("Reverted '" + A_D_G_path + "'")
-  svntest.actions.run_and_verify_svn(None, expected_output, [], "revert",
+  svntest.actions.run_and_verify_svn(expected_output, [], "revert",
                                      A_D_G_path)
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -796,7 +795,7 @@ def status_of_missing_dir_after_revert(s
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # When using single-db, we can get back to the virginal state.
-  svntest.actions.run_and_verify_svn(None, None, [], "revert",
+  svntest.actions.run_and_verify_svn(None, [], "revert",
                                      "-R", A_D_G_path)
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -814,7 +813,7 @@ def status_of_missing_dir_after_revert_r
 
   # delete A/D/G and commit
   G_path = os.path.join(wc_dir, "A", "D", "G")
-  svntest.actions.run_and_verify_svn(None, None, [], "rm", G_path)
+  svntest.actions.run_and_verify_svn(None, [], "rm", G_path)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.remove('A/D/G', 'A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau')
   expected_output = svntest.wc.State(wc_dir, {
@@ -827,7 +826,7 @@ def status_of_missing_dir_after_revert_r
 
   # copy A/D/G from A/B/E and commit
   E_path = os.path.join(wc_dir, "A", "B", "E")
-  svntest.actions.run_and_verify_svn(None, None, [], "cp", E_path, G_path)
+  svntest.actions.run_and_verify_svn(None, [], "cp", E_path, G_path)
   expected_status.add({
     'A/D/G' : Item(status='  ', wc_rev='3'),
     'A/D/G/alpha' : Item(status='  ', wc_rev='3'),
@@ -887,10 +886,10 @@ def status_of_missing_dir_after_revert_r
   expected_output = svntest.verify.UnorderedOutput([
     "Reverted '%s'\n" % path for path in revert_paths])
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [], "revert", "-R",
+  svntest.actions.run_and_verify_svn(expected_output, [], "revert", "-R",
                                      G_path)
 
-  svntest.actions.run_and_verify_svn(None, [], [],
+  svntest.actions.run_and_verify_svn([], [],
                                      "status", wc_dir)
 
   svntest.main.safe_rmtree(G_path)
@@ -899,7 +898,7 @@ def status_of_missing_dir_after_revert_r
       ["!       " + G_path + "\n",
        "!       " + os.path.join(G_path, "alpha") + "\n",
        "!       " + os.path.join(G_path, "beta") + "\n"])
-  svntest.actions.run_and_verify_svn(None, expected_output, [], "status",
+  svntest.actions.run_and_verify_svn(expected_output, [], "status",
                                      wc_dir)
 
 # Test for issue #2928.
@@ -973,7 +972,7 @@ def revert_tree_conflicts_in_updated_fil
   expected_disk.remove('A/D/G/tau')
 
   # Revert individually in wc
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', G_pi, G_rho, G_tau)
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
   svntest.actions.verify_disk(wc_dir, expected_disk)
@@ -988,7 +987,7 @@ def revert_tree_conflicts_in_updated_fil
   expected_status.wc_dir = wc_dir_2
 
   # Revert recursively in wc 2
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', '-R', G2)
   svntest.actions.run_and_verify_status(wc_dir_2, expected_status)
   svntest.actions.verify_disk(wc_dir_2, expected_disk)
@@ -1019,7 +1018,7 @@ def revert_added_tree(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', sbox.ospath('X'), sbox.ospath('X/Y'))
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.add({
@@ -1030,7 +1029,7 @@ def revert_added_tree(sbox):
 
   # Revert is non-recursive and fails, status is unchanged
   expected_error = '.*Try \'svn revert --depth infinity\'.*'
-  svntest.actions.run_and_verify_svn(None, None, expected_error,
+  svntest.actions.run_and_verify_svn(None, expected_error,
                                      'revert', sbox.ospath('X'))
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
@@ -1041,7 +1040,7 @@ def revert_child_of_copy(sbox):
 
   sbox.build()
   wc_dir = sbox.wc_dir
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'cp',
                                      sbox.ospath('A/B/E'),
                                      sbox.ospath('A/B/E2'))
@@ -1058,13 +1057,13 @@ def revert_child_of_copy(sbox):
 
   # First revert removes text change, child is still copied
   expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E2/beta')]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', sbox.ospath('A/B/E2/beta'))
   expected_status.tweak('A/B/E2/beta', status='  ')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Second revert of child does nothing, child is still copied
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'revert', sbox.ospath('A/B/E2/beta'))
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
@@ -1075,7 +1074,7 @@ def revert_non_recusive_after_delete(sbo
   sbox.build(read_only=True)
   wc_dir = sbox.wc_dir
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', sbox.ospath('A/B'))
+  svntest.actions.run_and_verify_svn(None, [], 'rm', sbox.ospath('A/B'))
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
   expected_status.tweak('A/B', 'A/B/E', 'A/B/E/alpha', 'A/B/E/beta', 'A/B/F',
                         'A/B/lambda', status='D ')
@@ -1083,19 +1082,19 @@ def revert_non_recusive_after_delete(sbo
 
   # This appears to work but gets the op-depth wrong
   expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B')]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', sbox.ospath('A/B'))
   expected_status.tweak('A/B', status='  ')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', sbox.ospath('A/B/E'))
   expected_status.tweak('A/B/E', status='R ')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
 
   # Since the op-depth was wrong A/B/E erroneously remains deleted
   expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E')]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', sbox.ospath('A/B/E'))
   expected_status.tweak('A/B/E', status='  ')
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -1143,7 +1142,7 @@ def revert_permissions_only(sbox):
   os.chmod(sbox.ospath('A/B/E/alpha'), 0444)  # read-only
   is_readonly(sbox.ospath('A/B/E/alpha'))
   expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/alpha')]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', sbox.ospath('A/B/E/alpha'))
   is_writable(sbox.ospath('A/B/E/alpha'))
 
@@ -1151,14 +1150,14 @@ def revert_permissions_only(sbox):
     os.chmod(sbox.ospath('A/B/E/beta'), 0777)   # executable
     is_executable(sbox.ospath('A/B/E/beta'))
     expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/beta')]
-    svntest.actions.run_and_verify_svn(None, expected_output, [],
+    svntest.actions.run_and_verify_svn(expected_output, [],
                                        'revert', sbox.ospath('A/B/E/beta'))
     is_non_executable(sbox.ospath('A/B/E/beta'))
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'svn:needs-lock', '1',
                                      sbox.ospath('A/B/E/alpha'))
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'propset', 'svn:executable', '1',
                                      sbox.ospath('A/B/E/beta'))
 
@@ -1177,7 +1176,7 @@ def revert_permissions_only(sbox):
   os.chmod(sbox.ospath('A/B/E/alpha'), 0666)  # not read-only
   is_writable(sbox.ospath('A/B/E/alpha'))
   expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/alpha')]
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', sbox.ospath('A/B/E/alpha'))
   is_readonly(sbox.ospath('A/B/E/alpha'))
 
@@ -1185,18 +1184,18 @@ def revert_permissions_only(sbox):
     os.chmod(sbox.ospath('A/B/E/beta'), 0666)   # not executable
     is_non_executable(sbox.ospath('A/B/E/beta'))
     expected_output = ["Reverted '%s'\n" % sbox.ospath('A/B/E/beta')]
-    svntest.actions.run_and_verify_svn(None, expected_output, [],
+    svntest.actions.run_and_verify_svn(expected_output, [],
                                        'revert', sbox.ospath('A/B/E/beta'))
     is_executable(sbox.ospath('A/B/E/beta'))
 
   # copied file is always writeable
   sbox.simple_update()
   expected_output = ["A         %s\n" % sbox.ospath('A/B/E2')]
-  svntest.actions.run_and_verify_svn(None, expected_output, [], 'copy',
+  svntest.actions.run_and_verify_svn(expected_output, [], 'copy',
                                      sbox.ospath('A/B/E'),
                                      sbox.ospath('A/B/E2'))
   is_writable(sbox.ospath('A/B/E2/alpha'))
-  svntest.actions.run_and_verify_svn(None, [], [],
+  svntest.actions.run_and_verify_svn([], [],
                                      'revert', sbox.ospath('A/B/E2/alpha'))
   is_writable(sbox.ospath('A/B/E2/alpha'))
 
@@ -1208,7 +1207,7 @@ def revert_copy_depth_files(sbox):
   sbox.build(read_only=True)
   wc_dir = sbox.wc_dir
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy',
                                      sbox.ospath('A/B/E'),
                                      sbox.ospath('A/B/E2'))
@@ -1226,7 +1225,7 @@ def revert_copy_depth_files(sbox):
                                                        'A/B/E2/alpha',
                                                        'A/B/E2/beta']])
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', '--depth', 'files',
                                      sbox.ospath('A/B/E2'))
 
@@ -1241,7 +1240,7 @@ def revert_nested_add_depth_immediates(s
   sbox.build(read_only=True)
   wc_dir = sbox.wc_dir
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', '--parents', sbox.ospath('A/X/Y'))
 
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -1254,7 +1253,7 @@ def revert_nested_add_depth_immediates(s
   expected_output = svntest.verify.UnorderedOutput([
     "Reverted '%s'\n" % sbox.ospath(path) for path in ['A/X', 'A/X/Y']])
 
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', '--depth', 'immediates',
                                      sbox.ospath('A/X'))
 
@@ -1272,7 +1271,7 @@ def create_superflous_actual_node(sbox):
   sbox.simple_update()
 
   # Create a NODES row with op-depth>0
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'copy', '-r', '1',
                                      sbox.repo_url + '/A/B/E/alpha',
                                      sbox.ospath('alpha'))
@@ -1284,7 +1283,7 @@ def create_superflous_actual_node(sbox):
     })
   svntest.actions.run_and_verify_status(wc_dir, expected_status)
   svntest.main.file_append(sbox.ospath('alpha'), 'my text\n')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'merge', '--accept', 'postpone',
                                      '^/A/B/E/alpha', sbox.ospath('alpha'))
   expected_status.tweak('alpha', status='CM', entry_status='A ')
@@ -1308,8 +1307,7 @@ def revert_empty_actual(sbox):
   wc_dir = sbox.wc_dir
 
   # Non-recursive code path works
-  svntest.actions.run_and_verify_svn(None,
-                                     ["Reverted '%s'\n" % sbox.ospath('alpha')],
+  svntest.actions.run_and_verify_svn(["Reverted '%s'\n" % sbox.ospath('alpha')],
                                      [],
                                      'revert', sbox.ospath('alpha'))
 
@@ -1326,8 +1324,7 @@ def revert_empty_actual_recursive(sbox):
 
   # Recursive code path fails, the superfluous actual node suppresses the
   # notification
-  svntest.actions.run_and_verify_svn(None,
-                                     ["Reverted '%s'\n" % sbox.ospath('alpha')],
+  svntest.actions.run_and_verify_svn(["Reverted '%s'\n" % sbox.ospath('alpha')],
                                      [],
                                      'revert', '-R', sbox.ospath('alpha'))
 
@@ -1504,7 +1501,7 @@ def create_no_text_change_conflict(sbox)
 
   # Update to create a conflict
   svntest.main.file_append(sbox.ospath('A/B/E/alpha'), 'my text\n')
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', '-r1', '--accept', 'postpone',
                                      wc_dir)
   expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -1522,8 +1519,7 @@ def revert_no_text_change_conflict(sbox)
   create_no_text_change_conflict(sbox)
   wc_dir = sbox.wc_dir
 
-  svntest.actions.run_and_verify_svn(None,
-                                     ["Reverted '%s'\n"
+  svntest.actions.run_and_verify_svn(["Reverted '%s'\n"
                                       % sbox.ospath('A/B/E/alpha')],
                                      [],
                                      'revert', sbox.ospath('A/B/E/alpha'))
@@ -1538,8 +1534,7 @@ def revert_no_text_change_conflict_recur
   create_no_text_change_conflict(sbox)
   wc_dir = sbox.wc_dir
 
-  svntest.actions.run_and_verify_svn(None,
-                                     ["Reverted '%s'\n"
+  svntest.actions.run_and_verify_svn(["Reverted '%s'\n"
                                       % sbox.ospath('A/B/E/alpha')],
                                      [],
                                      'revert', '-R', wc_dir)
@@ -1575,7 +1570,7 @@ def revert_with_unversioned_targets(sbox
     "Skipped '%s'\n" % sbox.ospath('A/D/H/delta'),
     "Reverted '%s'\n" % sbox.ospath('A/D/H/psi'),
   ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'revert', chi_path, delta_path, psi_path)
 
   # verify status
@@ -1595,7 +1590,7 @@ def revert_with_unversioned_targets(sbox
 def revert_nonexistent(sbox):
   'svn revert -R nonexistent'
   sbox.build(read_only=True)
-  svntest.actions.run_and_verify_svn(None, 'Skipped.*nonexistent', [],
+  svntest.actions.run_and_verify_svn('Skipped.*nonexistent', [],
                                      'revert', '-R', sbox.ospath('nonexistent'))
 
 @Issue(4168)
@@ -1642,7 +1637,7 @@ def revert_obstructing_wc(sbox):
   # Revert should do nothing (no local changes), and report the obstruction
   # (reporting the obstruction is nice for debugging, but not really required
   #  in this specific case, as the node was not modified)
-  svntest.actions.run_and_verify_svn(None, "Skipped '.*A' -- .*obstruct.*", [],
+  svntest.actions.run_and_verify_svn("Skipped '.*A' -- .*obstruct.*", [],
                                      'revert', '-R', wc_dir)
 
 



Mime
View raw message