subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1659291 [18/21] - in /subversion/branches/remove-log-addressing: ./ subversion/include/ subversion/include/private/ subversion/libsvn_delta/ subversion/libsvn_fs_base/ subversion/libsvn_fs_fs/ subversion/libsvn_fs_x/ subversion/libsvn_repo...
Date Thu, 12 Feb 2015 15:50:48 GMT
Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py?rev=1659291&r1=1659290&r2=1659291&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py Thu Feb 12 15:50:47 2015
@@ -277,8 +277,7 @@ def load_and_verify_dumpstream(sbox, exp
   if revs:
     # verify revs as wc states
     for rev in range(len(revs)):
-      svntest.actions.run_and_verify_svn("Updating to r%s" % (rev+1),
-                                         svntest.verify.AnyOutput, [],
+      svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
                                          "update", "-r%s" % (rev+1),
                                          sbox.wc_dir)
 
@@ -421,7 +420,7 @@ def empty_date(sbox):
                              '--ignore-uuid')
 
   # Verify that the revision still lacks the svn:date property.
-  svntest.actions.run_and_verify_svn(None, [], '.*(E195011|E200017).*svn:date',
+  svntest.actions.run_and_verify_svn([], '.*(E195011|E200017).*svn:date',
                                      "propget", "--revprop", "-r1", "svn:date",
                                      sbox.wc_dir)
 
@@ -501,7 +500,7 @@ def hotcopy_dot(sbox):
 
   os.chdir(backup_dir)
   svntest.actions.run_and_verify_svnadmin(
-    None, None, [],
+    None, [],
     "hotcopy", os.path.join(cwd, sbox.repo_dir), '.')
 
   os.chdir(cwd)
@@ -552,7 +551,7 @@ def setrevprop(sbox):
   # Try a simple log property modification.
   iota_path = os.path.join(sbox.wc_dir, "iota")
   mu_path = sbox.ospath('A/mu')
-  svntest.actions.run_and_verify_svnadmin(None, [], [],
+  svntest.actions.run_and_verify_svnadmin([], [],
                                           "setlog", sbox.repo_dir, "-r0",
                                           "--bypass-hooks",
                                           iota_path)
@@ -562,14 +561,13 @@ def setrevprop(sbox):
   #
   # Note that we attempt to set the log message to a different value than the
   # successful call.
-  svntest.actions.run_and_verify_svnadmin(None, [], svntest.verify.AnyOutput,
+  svntest.actions.run_and_verify_svnadmin([], svntest.verify.AnyOutput,
                                           "setlog", sbox.repo_dir, "-r0",
                                           mu_path)
 
   # Verify that the revprop value matches what we set when retrieved
   # through the client.
-  svntest.actions.run_and_verify_svn(None,
-                                     [ "This is the file 'iota'.\n", "\n" ],
+  svntest.actions.run_and_verify_svn([ "This is the file 'iota'.\n", "\n" ],
                                      [], "propget", "--revprop", "-r0",
                                      "svn:log", sbox.wc_dir)
 
@@ -587,15 +585,15 @@ def setrevprop(sbox):
 
   # Verify that the revprop value matches what we set when retrieved
   # through the client.
-  svntest.actions.run_and_verify_svn(None, [ "foo\n" ], [], "propget",
+  svntest.actions.run_and_verify_svn([ "foo\n" ], [], "propget",
                                      "--revprop", "-r0", "svn:author",
                                      sbox.wc_dir)
 
   # Delete the property.
-  svntest.actions.run_and_verify_svnadmin(None, [], [],
+  svntest.actions.run_and_verify_svnadmin([], [],
                                           "delrevprop", "-r0", sbox.repo_dir,
                                           "svn:author")
-  svntest.actions.run_and_verify_svnlook(None, [], ".*E200017.*svn:author.*",
+  svntest.actions.run_and_verify_svnlook([], ".*E200017.*svn:author.*",
                                          "propget", "--revprop", "-r0",
                                          sbox.repo_dir, "svn:author")
 
@@ -607,7 +605,7 @@ def verify_windows_paths_in_repos(sbox):
   repo_url       = sbox.repo_url
   chi_url = sbox.repo_url + '/c:hi'
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', '-m', 'log_msg',
                                      chi_url)
 
@@ -678,7 +676,7 @@ def verify_incremental_fsfs(sbox):
   E_url = sbox.repo_url + '/A/B/E'
 
   # Create A/B/E/bravo in r2.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', '-m', 'log_msg',
                                      E_url + '/bravo')
   # Corrupt r2's reference to A/C by replacing "dir 7-1.0.r1/1568" with
@@ -919,21 +917,18 @@ def load_with_parent_dir(sbox):
   dumpfile = open(dumpfile_location).read()
 
   # Create 'sample' dir in sbox.repo_url, and load the dump stream there.
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 1.\n'],
                                      [], "mkdir", sbox.repo_url + "/sample",
                                      "-m", "Create sample dir")
   load_dumpstream(sbox, dumpfile, '--parent-dir', '/sample')
 
   # Verify the svn:mergeinfo properties for '--parent-dir'
-  svntest.actions.run_and_verify_svn(None,
-                                     [sbox.repo_url +
+  svntest.actions.run_and_verify_svn([sbox.repo_url +
                                       "/sample/branch - /sample/trunk:5-7\n"],
                                      [], 'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url + '/sample/branch')
-  svntest.actions.run_and_verify_svn(None,
-                                     [sbox.repo_url +
+  svntest.actions.run_and_verify_svn([sbox.repo_url +
                                       "/sample/branch1 - " +
                                       "/sample/branch:6-9\n"],
                                      [], 'propget', 'svn:mergeinfo', '-R',
@@ -942,22 +937,19 @@ def load_with_parent_dir(sbox):
   # Create 'sample-2' dir in sbox.repo_url, and load the dump stream again.
   # This time, don't include a leading slash on the --parent-dir argument.
   # See issue #3547.
-  svntest.actions.run_and_verify_svn(None,
-                                     ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                       'Committed revision 11.\n'],
                                      [], "mkdir", sbox.repo_url + "/sample-2",
                                      "-m", "Create sample-2 dir")
   load_dumpstream(sbox, dumpfile, '--parent-dir', 'sample-2')
 
   # Verify the svn:mergeinfo properties for '--parent-dir'.
-  svntest.actions.run_and_verify_svn(None,
-                                     [sbox.repo_url +
+  svntest.actions.run_and_verify_svn([sbox.repo_url +
                                       "/sample-2/branch - " +
                                       "/sample-2/trunk:15-17\n"],
                                      [], 'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url + '/sample-2/branch')
-  svntest.actions.run_and_verify_svn(None,
-                                     [sbox.repo_url +
+  svntest.actions.run_and_verify_svn([sbox.repo_url +
                                       "/sample-2/branch1 - " +
                                       "/sample-2/branch:16-19\n"],
                                      [], 'propget', 'svn:mergeinfo', '-R',
@@ -977,11 +969,11 @@ def set_uuid(sbox):
   orig_uuid = output[0].rstrip()
 
   # Try setting a new, bogus UUID.
-  svntest.actions.run_and_verify_svnadmin(None, None, '^.*Malformed UUID.*$',
+  svntest.actions.run_and_verify_svnadmin(None, '^.*Malformed UUID.*$',
                                           'setuuid', sbox.repo_dir, 'abcdef')
 
   # Try generating a brand new UUID.
-  svntest.actions.run_and_verify_svnadmin(None, [], None,
+  svntest.actions.run_and_verify_svnadmin([], None,
                                           'setuuid', sbox.repo_dir)
   exit_code, output, errput = svntest.main.run_svnlook('uuid', sbox.repo_dir)
   if errput:
@@ -992,7 +984,7 @@ def set_uuid(sbox):
     raise svntest.Failure
 
   # Now, try setting the UUID back to the original value.
-  svntest.actions.run_and_verify_svnadmin(None, [], None,
+  svntest.actions.run_and_verify_svnadmin([], None,
                                           'setuuid', sbox.repo_dir, orig_uuid)
   exit_code, output, errput = svntest.main.run_svnlook('uuid', sbox.repo_dir)
   if errput:
@@ -1017,7 +1009,7 @@ def reflect_dropped_renumbered_revs(sbox
   dumpfile = open(dumpfile_location).read()
 
   # Create 'toplevel' dir in sbox.repo_url
-  svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                             'Committed revision 1.\n'],
                                      [], "mkdir", sbox.repo_url + "/toplevel",
                                      "-m", "Create toplevel dir")
@@ -1034,7 +1026,7 @@ def reflect_dropped_renumbered_revs(sbox
     url + "/trunk - /branch1:5-9\n",
     url + "/toplevel/trunk - /toplevel/branch1:14-18\n",
     ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -1265,7 +1257,7 @@ def dont_drop_valid_mergeinfo_during_inc
     url + "B2 - /trunk:9\n",
     url + "B1/B/E - /branches/B2/B/E:11-12\n",
     "/trunk/B/E:5-6,8-9\n"])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -1304,7 +1296,7 @@ def dont_drop_valid_mergeinfo_during_inc
   # Check the mergeinfo, we use the same expected output as before,
   # as it (duh!) should be exactly the same as when we loaded the
   # repos in one shot.
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -1358,7 +1350,7 @@ def dont_drop_valid_mergeinfo_during_inc
     url + "B2 - /Projects/Project-X/trunk:15\n",
     url + "B1/B/E - /Projects/Project-X/branches/B2/B/E:17-18\n",
     "/Projects/Project-X/trunk/B/E:11-12,14-15\n"])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -1381,7 +1373,7 @@ def dont_drop_valid_mergeinfo_during_inc
   # Check the resulting mergeinfo.  We expect the exact same results
   # as Part 3.
   # See http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc16.
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -1431,7 +1423,7 @@ def hotcopy_symlink(sbox):
     os.symlink(target_abspath, symlink_path + '_abs')
 
   svntest.actions.run_and_verify_svnadmin(
-    None, None, [],
+    None, [],
     "hotcopy", original_repo, hotcopy_repo)
 
   # Check if the symlinks were copied correctly.
@@ -1600,7 +1592,7 @@ def test_lslocks_and_rmlocks(sbox):
      "'.*iota' locked by user 'jrandom'.\n"])
 
   # Lock iota and A/B/lambda using svn client
-  svntest.actions.run_and_verify_svn(None, expected_output,
+  svntest.actions.run_and_verify_svn(expected_output,
                                      [], "lock", "-m", "Locking files",
                                      iota_url, lambda_url)
 
@@ -1673,13 +1665,13 @@ def load_ranges(sbox):
   # Load our dumpfile, 2 revisions at a time, verifying that we have
   # the correct youngest revision after each load.
   load_dumpstream(sbox, dumpdata, '-r0:2')
-  svntest.actions.run_and_verify_svnlook("Unexpected output", ['2\n'],
+  svntest.actions.run_and_verify_svnlook(['2\n'],
                                          None, 'youngest', sbox.repo_dir)
   load_dumpstream(sbox, dumpdata, '-r3:4')
-  svntest.actions.run_and_verify_svnlook("Unexpected output", ['4\n'],
+  svntest.actions.run_and_verify_svnlook(['4\n'],
                                          None, 'youngest', sbox.repo_dir)
   load_dumpstream(sbox, dumpdata, '-r5:6')
-  svntest.actions.run_and_verify_svnlook("Unexpected output", ['6\n'],
+  svntest.actions.run_and_verify_svnlook(['6\n'],
                                          None, 'youngest', sbox.repo_dir)
 
   # There are ordering differences in the property blocks.
@@ -1710,7 +1702,7 @@ def hotcopy_incremental(sbox):
   for i in [1, 2, 3]:
     os.chdir(backup_dir)
     svntest.actions.run_and_verify_svnadmin(
-      None, None, [],
+      None, [],
       "hotcopy", "--incremental", os.path.join(cwd, sbox.repo_dir), '.')
 
     os.chdir(cwd)
@@ -1738,14 +1730,14 @@ def hotcopy_incremental_packed(sbox):
   if not (svntest.main.is_fs_type_fsfs and svntest.main.options.fsfs_packing
           and svntest.main.options.fsfs_sharding == 2):
     svntest.actions.run_and_verify_svnadmin(
-      None, ['Packing revisions in shard 0...done.\n'], [], "pack",
+      ['Packing revisions in shard 0...done.\n'], [], "pack",
       os.path.join(cwd, sbox.repo_dir))
 
   # Commit 5 more revs, hotcopy and pack after each commit.
   for i in [1, 2, 3, 4, 5]:
     os.chdir(backup_dir)
     svntest.actions.run_and_verify_svnadmin(
-      None, None, [],
+      None, [],
       "hotcopy", "--incremental", os.path.join(cwd, sbox.repo_dir), '.')
 
     os.chdir(cwd)
@@ -1761,7 +1753,7 @@ def hotcopy_incremental_packed(sbox):
       else:
         expected_output = []
       svntest.actions.run_and_verify_svnadmin(
-        None, expected_output, [], "pack", os.path.join(cwd, sbox.repo_dir))
+        expected_output, [], "pack", os.path.join(cwd, sbox.repo_dir))
 
 
 def locking(sbox):
@@ -1776,7 +1768,7 @@ def locking(sbox):
 
   # Test illegal character in comment file.
   expected_error = ".*svnadmin: E130004:.*"
-  svntest.actions.run_and_verify_svnadmin(None, None,
+  svntest.actions.run_and_verify_svnadmin(None,
                                           expected_error, "lock",
                                           sbox.repo_dir,
                                           "iota", "jrandom",
@@ -1784,7 +1776,7 @@ def locking(sbox):
 
   # Test locking path with --bypass-hooks
   expected_output = "'iota' locked by user 'jrandom'."
-  svntest.actions.run_and_verify_svnadmin(None, expected_output,
+  svntest.actions.run_and_verify_svnadmin(expected_output,
                                           None, "lock",
                                           sbox.repo_dir,
                                           "iota", "jrandom",
@@ -1792,13 +1784,13 @@ def locking(sbox):
                                           "--bypass-hooks")
 
   # Remove lock
-  svntest.actions.run_and_verify_svnadmin(None, None,
+  svntest.actions.run_and_verify_svnadmin(None,
                                           None, "rmlocks",
                                           sbox.repo_dir, "iota")
 
   # Test locking path without --bypass-hooks
   expected_output = "'iota' locked by user 'jrandom'."
-  svntest.actions.run_and_verify_svnadmin(None, expected_output,
+  svntest.actions.run_and_verify_svnadmin(expected_output,
                                           None, "lock",
                                           sbox.repo_dir,
                                           "iota", "jrandom",
@@ -1806,7 +1798,7 @@ def locking(sbox):
 
   # Test locking already locked path.
   expected_error = ".*svnadmin: E160035:.*"
-  svntest.actions.run_and_verify_svnadmin(None, None,
+  svntest.actions.run_and_verify_svnadmin(None,
                                           expected_error, "lock",
                                           sbox.repo_dir,
                                           "iota", "jrandom",
@@ -1814,7 +1806,7 @@ def locking(sbox):
 
   # Test locking non-existent path.
   expected_error = ".*svnadmin: E160013:.*"
-  svntest.actions.run_and_verify_svnadmin(None, None,
+  svntest.actions.run_and_verify_svnadmin(None,
                                           expected_error, "lock",
                                           sbox.repo_dir,
                                           "non-existent", "jrandom",
@@ -1823,7 +1815,7 @@ def locking(sbox):
   # Test locking a path while specifying a lock token.
   expected_output = "'A/D/G/rho' locked by user 'jrandom'."
   lock_token = "opaquelocktoken:01234567-89ab-cdef-89ab-cdef01234567"
-  svntest.actions.run_and_verify_svnadmin(None, expected_output,
+  svntest.actions.run_and_verify_svnadmin(expected_output,
                                           None, "lock",
                                           sbox.repo_dir,
                                           "A/D/G/rho", "jrandom",
@@ -1832,7 +1824,7 @@ def locking(sbox):
   # Test unlocking a path, but provide the wrong lock token.
   expected_error = ".*svnadmin: E160040:.*"
   wrong_lock_token = "opaquelocktoken:12345670-9ab8-defc-9ab8-def01234567c"
-  svntest.actions.run_and_verify_svnadmin(None, None,
+  svntest.actions.run_and_verify_svnadmin(None,
                                           expected_error, "unlock",
                                           sbox.repo_dir,
                                           "A/D/G/rho", "jrandom",
@@ -1841,7 +1833,7 @@ def locking(sbox):
   # Test unlocking the path again, but this time provide the correct
   # lock token.
   expected_output = "'A/D/G/rho' unlocked."
-  svntest.actions.run_and_verify_svnadmin(None, expected_output,
+  svntest.actions.run_and_verify_svnadmin(expected_output,
                                           None, "unlock",
                                           sbox.repo_dir,
                                           "A/D/G/rho", "jrandom",
@@ -1856,7 +1848,7 @@ def locking(sbox):
   # Test locking a path.  Don't use --bypass-hooks, though, as we wish
   # to verify that hook script is really getting executed.
   expected_error = ".*svnadmin: E165001:.*"
-  svntest.actions.run_and_verify_svnadmin(None, None,
+  svntest.actions.run_and_verify_svnadmin(None,
                                           expected_error, "lock",
                                           sbox.repo_dir,
                                           "iota", "jrandom",
@@ -1878,7 +1870,7 @@ def locking(sbox):
   # Try to unlock a path while providing the correct lock token but
   # with a preventative hook in place.
   expected_error = ".*svnadmin: E165001:.*"
-  svntest.actions.run_and_verify_svnadmin(None, None,
+  svntest.actions.run_and_verify_svnadmin(None,
                                           expected_error, "unlock",
                                           sbox.repo_dir,
                                           "iota", "jrandom",
@@ -1887,7 +1879,7 @@ def locking(sbox):
   # Finally, use --bypass-hooks to unlock the path (again using the
   # correct lock token).
   expected_output = "'iota' unlocked."
-  svntest.actions.run_and_verify_svnadmin(None, expected_output,
+  svntest.actions.run_and_verify_svnadmin(expected_output,
                                           None, "unlock",
                                           "--bypass-hooks",
                                           sbox.repo_dir,
@@ -1939,7 +1931,7 @@ def mergeinfo_race(sbox):
 def recover_old_empty(sbox):
   "recover empty --compatible-version=1.3"
   sbox.build(create_wc=False, empty=True, minor_version=3)
-  svntest.actions.run_and_verify_svnadmin(None, None, [],
+  svntest.actions.run_and_verify_svnadmin(None, [],
                                           "recover", sbox.repo_dir)
 
 
@@ -1953,11 +1945,11 @@ def verify_keep_going(sbox):
   C_url = sbox.repo_url + '/C'
 
   # Create A/B/E/bravo in r2.
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', '-m', 'log_msg',
                                      B_url)
 
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mkdir', '-m', 'log_msg',
                                      C_url)
   
@@ -2023,7 +2015,7 @@ def verify_invalid_path_changes(sbox):
 
   # Create a number of revisions each adding a single path
   for r in range(2,20):
-    svntest.actions.run_and_verify_svn(None, None, [],
+    svntest.actions.run_and_verify_svn(None, [],
                                        'mkdir', '-m', 'log_msg',
                                        sbox.repo_url + '/B' + str(r))
 
@@ -2210,7 +2202,7 @@ def fsfs_recover_old_non_empty(sbox):
   # svnadmin: E200002: Serialized hash missing terminator
 
   sbox.build(create_wc=False, minor_version=3)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "recover",
+  svntest.actions.run_and_verify_svnadmin(None, [], "recover",
                                           sbox.repo_dir)
 
 
@@ -2224,7 +2216,7 @@ def fsfs_hotcopy_old_non_empty(sbox):
 
   sbox.build(create_wc=False, minor_version=3)
   backup_dir, backup_url = sbox.add_repo_path('backup')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
 
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2244,7 +2236,7 @@ def load_ignore_dates(sbox):
                                         'skeleton_repos.dump')).read()
 
   load_dumpstream(sbox, dumpfile_skeleton, '--ignore-dates')
-  svntest.actions.run_and_verify_svnlook("Unexpected output", ['6\n'],
+  svntest.actions.run_and_verify_svnlook(['6\n'],
                                          None, 'youngest', sbox.repo_dir)
   for rev in range(1, 6):
     exit_code, output, errput = svntest.main.run_svnlook('date', '-r', rev,
@@ -2283,9 +2275,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
 
   # r1 = Initial greek tree sandbox.
   backup_dir, backup_url = sbox.add_repo_path('backup-after-r1')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           "--incremental",
                                           sbox.repo_dir, inc_backup_dir)
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2296,9 +2288,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
   sbox.simple_commit(message='r2')
 
   backup_dir, backup_url = sbox.add_repo_path('backup-after-r2')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           "--incremental",
                                           sbox.repo_dir, inc_backup_dir)
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2309,9 +2301,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
   sbox.simple_commit(message='r3')
 
   backup_dir, backup_url = sbox.add_repo_path('backup-after-r3')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           "--incremental",
                                           sbox.repo_dir, inc_backup_dir)
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2322,9 +2314,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
   sbox.simple_commit(message='r4')
 
   backup_dir, backup_url = sbox.add_repo_path('backup-after-r4')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           "--incremental",
                                           sbox.repo_dir, inc_backup_dir)
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2335,9 +2327,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
   sbox.simple_commit(message='r5')
 
   backup_dir, backup_url = sbox.add_repo_path('backup-after-r5')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           "--incremental",
                                           sbox.repo_dir, inc_backup_dir)
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2348,9 +2340,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
   sbox.simple_commit(message='r6')
 
   backup_dir, backup_url = sbox.add_repo_path('backup-after-r6')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           "--incremental",
                                           sbox.repo_dir, inc_backup_dir)
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2362,9 +2354,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
   sbox.simple_commit(message='r7')
 
   backup_dir, backup_url = sbox.add_repo_path('backup-after-r7')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           "--incremental",
                                           sbox.repo_dir, inc_backup_dir)
   check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2404,7 +2396,7 @@ def verify_packed(sbox):
     expected_output = ["Packing revisions in shard 0...done.\n",
                        "Packing revisions in shard 1...done.\n",
                        "Packing revisions in shard 2...done.\n"]
-    svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+    svntest.actions.run_and_verify_svnadmin(expected_output, [],
                                             "pack", sbox.repo_dir)
 
   if svntest.main.is_fs_log_addressing():
@@ -2427,7 +2419,7 @@ def verify_packed(sbox):
                        "* Verified revision 4.\n",
                        "* Verified revision 5.\n"]
 
-  svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+  svntest.actions.run_and_verify_svnadmin(expected_output, [],
                                           "verify", sbox.repo_dir)
 
 # Test that 'svnadmin freeze' is nestable.  (For example, this ensures it
@@ -2442,7 +2434,7 @@ def freeze_freeze(sbox):
 
   sbox.build(create_wc=False, read_only=True)
   second_repo_dir, _ = sbox.add_repo_path('backup')
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+  svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
                                           sbox.repo_dir, second_repo_dir)
 
   if svntest.main.is_fs_type_fsx() or \
@@ -2454,10 +2446,10 @@ def freeze_freeze(sbox):
     # for new FS formats, but in order to avoid a deadlock for old formats,
     # we have to manually assign a new UUID for the hotcopy destination.
     # As of trunk@1618024, the same applies to FSX repositories.
-    svntest.actions.run_and_verify_svnadmin(None, [], None,
+    svntest.actions.run_and_verify_svnadmin([], None,
                                             'setuuid', second_repo_dir)
 
-  svntest.actions.run_and_verify_svnadmin(None, None, [],
+  svntest.actions.run_and_verify_svnadmin(None, [],
                  'freeze', '--', sbox.repo_dir,
                  svntest.main.svnadmin_binary, 'freeze', '--', second_repo_dir,
                  sys.executable, '-c', 'True')
@@ -2466,7 +2458,7 @@ def freeze_freeze(sbox):
   svntest.main.file_write(arg_file,
                           "%s\n%s\n" % (sbox.repo_dir, second_repo_dir))
 
-  svntest.actions.run_and_verify_svnadmin(None, None, [],
+  svntest.actions.run_and_verify_svnadmin(None, [],
                                           'freeze', '-F', arg_file, '--',
                                           sys.executable, '-c', 'True')
 
@@ -2561,17 +2553,17 @@ def fsfs_hotcopy_progress(sbox):
     ]
 
   backup_dir, backup_url = sbox.add_repo_path('backup-0')
-  svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+  svntest.actions.run_and_verify_svnadmin(expected_full, [],
                                           'hotcopy',
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+  svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
                                           'hotcopy', '--incremental',
                                           sbox.repo_dir, inc_backup_dir)
 
   # Commit three revisions.  After this step we have a full shard
   # (r0, r1, r2) and the second shard (r3) with a single revision.
   for i in range(3):
-    svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+    svntest.actions.run_and_verify_svn(None, [], 'mkdir',
                                        '-m', svntest.main.make_log_msg(),
                                        sbox.repo_url + '/dir-%i' % i)
   expected_full = [
@@ -2587,10 +2579,10 @@ def fsfs_hotcopy_progress(sbox):
     ]
 
   backup_dir, backup_url = sbox.add_repo_path('backup-1')
-  svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+  svntest.actions.run_and_verify_svnadmin(expected_full, [],
                                           'hotcopy',
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+  svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
                                           'hotcopy', '--incremental',
                                           sbox.repo_dir, inc_backup_dir)
 
@@ -2598,7 +2590,7 @@ def fsfs_hotcopy_progress(sbox):
   # the --incremental output should track the incoming (r0, r1, r2) pack and
   # should not mention r3, because it is already a part of the destination
   # and is *not* a part of the incoming pack.
-  svntest.actions.run_and_verify_svnadmin(None, None, [], 'pack',
+  svntest.actions.run_and_verify_svnadmin(None, [], 'pack',
                                           sbox.repo_dir)
   expected_full = [
     "* Copied revisions from 0 to 2.\n",
@@ -2609,25 +2601,25 @@ def fsfs_hotcopy_progress(sbox):
     ]
 
   backup_dir, backup_url = sbox.add_repo_path('backup-2')
-  svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+  svntest.actions.run_and_verify_svnadmin(expected_full, [],
                                           'hotcopy',
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+  svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
                                           'hotcopy', '--incremental',
                                           sbox.repo_dir, inc_backup_dir)
 
   # Fill the second shard, pack again, commit several unpacked revisions
   # on top of it.  Rerun the hotcopy and check the progress output.
   for i in range(4, 6):
-    svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+    svntest.actions.run_and_verify_svn(None, [], 'mkdir',
                                        '-m', svntest.main.make_log_msg(),
                                        sbox.repo_url + '/dir-%i' % i)
 
-  svntest.actions.run_and_verify_svnadmin(None, None, [], 'pack',
+  svntest.actions.run_and_verify_svnadmin(None, [], 'pack',
                                           sbox.repo_dir)
 
   for i in range(6, 8):
-    svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+    svntest.actions.run_and_verify_svn(None, [], 'mkdir',
                                        '-m', svntest.main.make_log_msg(),
                                        sbox.repo_url + '/dir-%i' % i)
   expected_full = [
@@ -2643,10 +2635,10 @@ def fsfs_hotcopy_progress(sbox):
     ]
 
   backup_dir, backup_url = sbox.add_repo_path('backup-3')
-  svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+  svntest.actions.run_and_verify_svnadmin(expected_full, [],
                                           'hotcopy',
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+  svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
                                           'hotcopy', '--incremental',
                                           sbox.repo_dir, inc_backup_dir)
 
@@ -2664,7 +2656,7 @@ def fsfs_hotcopy_progress_with_revprop_c
   sbox.build(create_wc=False, empty=True)
 
   for i in range(6):
-    svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+    svntest.actions.run_and_verify_svn(None, [], 'mkdir',
                                        '-m', svntest.main.make_log_msg(),
                                        sbox.repo_url + '/dir-%i' % i)
   expected_output = [
@@ -2678,7 +2670,7 @@ def fsfs_hotcopy_progress_with_revprop_c
     ]
 
   backup_dir, backup_url = sbox.add_repo_path('backup')
-  svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+  svntest.actions.run_and_verify_svnadmin(expected_output, [],
                                           'hotcopy',
                                           sbox.repo_dir, backup_dir)
 
@@ -2688,7 +2680,7 @@ def fsfs_hotcopy_progress_with_revprop_c
   svntest.main.file_write(revprop_file, "Modified log message.")
 
   for i in [1, 3, 6]:
-    svntest.actions.run_and_verify_svnadmin(None, None, [],
+    svntest.actions.run_and_verify_svnadmin(None, [],
                                             'setrevprop',
                                             sbox.repo_dir, '-r', i,
                                             'svn:log', revprop_file)
@@ -2697,7 +2689,7 @@ def fsfs_hotcopy_progress_with_revprop_c
     "* Copied revision 3.\n",
     "* Copied revision 6.\n",
     ]
-  svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+  svntest.actions.run_and_verify_svnadmin(expected_output, [],
                                           'hotcopy', '--incremental',
                                           sbox.repo_dir, backup_dir)
 
@@ -2719,16 +2711,16 @@ def fsfs_hotcopy_progress_old(sbox):
     ]
 
   backup_dir, backup_url = sbox.add_repo_path('backup-0')
-  svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+  svntest.actions.run_and_verify_svnadmin(expected_full, [],
                                           'hotcopy',
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+  svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
                                           'hotcopy', '--incremental',
                                           sbox.repo_dir, inc_backup_dir)
 
   # Commit three revisions, hotcopy and check the progress output.
   for i in range(3):
-    svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+    svntest.actions.run_and_verify_svn(None, [], 'mkdir',
                                        '-m', svntest.main.make_log_msg(),
                                        sbox.repo_url + '/dir-%i' % i)
 
@@ -2745,10 +2737,10 @@ def fsfs_hotcopy_progress_old(sbox):
     ]
 
   backup_dir, backup_url = sbox.add_repo_path('backup-1')
-  svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+  svntest.actions.run_and_verify_svnadmin(expected_full, [],
                                           'hotcopy',
                                           sbox.repo_dir, backup_dir)
-  svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+  svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
                                           'hotcopy', '--incremental',
                                           sbox.repo_dir, inc_backup_dir)
 
@@ -2780,7 +2772,7 @@ def freeze_same_uuid(sbox):
   svntest.main.file_write(arg_file,
                           "%s\n%s\n" % (first_repo_dir, second_repo_dir))
 
-  svntest.actions.run_and_verify_svnadmin(None, None, None,
+  svntest.actions.run_and_verify_svnadmin(None, None,
                                           'freeze', '-F', arg_file, '--',
                                           sys.executable, '-c', 'True')
 
@@ -2790,10 +2782,10 @@ def upgrade(sbox):
   "upgrade --compatible-version=1.3"
 
   sbox.build(create_wc=False, minor_version=3)
-  svntest.actions.run_and_verify_svnadmin(None, None, [], "upgrade",
+  svntest.actions.run_and_verify_svnadmin(None, [], "upgrade",
                                           sbox.repo_dir)
   # Does the repository work after upgrade?
-  svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+  svntest.actions.run_and_verify_svn(['Committing transaction...\n',
                                      'Committed revision 2.\n'], [], 'mkdir',
                                      '-m', svntest.main.make_log_msg(),
                                      sbox.repo_url + '/dir')

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnauthz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnauthz_tests.py?rev=1659291&r1=1659290&r2=1659291&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnauthz_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnauthz_tests.py Thu Feb 12 15:50:47 2015
@@ -92,20 +92,20 @@ def svnauthz_validate_file_test(sbox):
   svntest.main.file_write(authz_path, authz_content)
 
   # Valid authz file
-  svntest.actions.run_and_verify_svnauthz("Valid authz file", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           0, False, "validate", authz_path)
 
   # Invalid authz file, expect exit code 1, we found the file loaded it
   # but found an error
   svntest.main.file_write(authz_path, 'x\n')
-  svntest.actions.run_and_verify_svnauthz("Invalid authz file", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           1, False, "validate", authz_path)
 
   # Non-existent authz file
   # exit code 2, operational error since we can't test the file.
   os.close(authz_fd)
   os.remove(authz_path)
-  svntest.actions.run_and_verify_svnauthz("Non-existent authz file", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 2, False, "validate",
                                           authz_path)
 
@@ -134,18 +134,18 @@ def svnauthz_validate_repo_test(sbox):
 
   # Valid authz url (file stored in repo)
   authz_url = repo_url + '/A/authz'
-  svntest.actions.run_and_verify_svnauthz("Valid authz url", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           0, False, "validate", authz_url)
 
   # Invalid authz url (again use the iota file in the repo)
   # expect exit code 1, we found the file loaded it but found an error
   iota_url = repo_url + '/iota'
-  svntest.actions.run_and_verify_svnauthz("Invalid authz url", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           1, False, "validate", iota_url)
 
   # Non-existent authz url
   # exit code 2, operational error since we can't test the file.
-  svntest.actions.run_and_verify_svnauthz("Non-existent authz file", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 2, False, "validate",
                                           repo_url + "/zilch")
 
@@ -220,38 +220,35 @@ def svnauthz_accessof_file_test(sbox):
   # Anonymous access with no path, and no repository should be rw
   # since it returns the highest level of access granted anywhere.
   # So /bios being rw for everyone means this will be rw.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access", ["rw\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
                                           0, False, "accessof", authz_path)
 
   # Anonymous access on /jokes should be r, no repo so won't match
   # the slapstick:/jokes section.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path",
-                                          ["r\n"], None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(["r\n"], None, 0, False, "accessof",
                                           authz_path, "--path", "/jokes")
 
   # Anonymous access on /jokes on slapstick repo should be no
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
-                                          ["no\n"], None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--repository", "slapstick")
 
   # User access with no path, and no repository should be rw
   # since it returns the h ighest level of access anywhere.
   # So /bios being rw for everyone means this will be rw.
-  svntest.actions.run_and_verify_svnauthz("User access", ["rw\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
                                           0, False, "accessof", authz_path,
                                           "--username", "groucho")
 
   # User groucho specified on /jokes with no repo, will not match any of the
   # repo specific sections, so is r since everyone has read access.
-  svntest.actions.run_and_verify_svnauthz("User access on path", ["r\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["r\n"], None,
                                           0, False, "accessof", authz_path,
                                           "--path", "/jokes", "--username",
                                           "groucho")
 
   # User groucho specified on /jokes with the repo comedy will be rw
-  svntest.actions.run_and_verify_svnauthz("User access on path with repo",
-                                          ["rw\n"], None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None, 0, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy")
@@ -289,38 +286,35 @@ def svnauthz_accessof_repo_test(sbox):
   # since it returns the highest level of access granted anywhere.
   # So /bios being rw for everyone means this will be rw.
   authz_url = repo_url + "/A/authz"
-  svntest.actions.run_and_verify_svnauthz("Anonymous access", ["rw\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
                                           0, False, "accessof", authz_url)
 
   # Anonymous access on /jokes should be r, no repo so won't match
   # the slapstick:/jokes section.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path",
-                                          ["r\n"], None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(["r\n"], None, 0, False, "accessof",
                                           authz_url, "--path", "/jokes")
 
   # Anonymous access on /jokes on slapstick repo should be no
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
-                                          ["no\n"], None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--repository", "slapstick")
 
   # User access with no path, and no repository should be rw
   # since it returns the h ighest level of access anywhere.
   # So /bios being rw for everyone means this will be rw.
-  svntest.actions.run_and_verify_svnauthz("User access", ["rw\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
                                           0, False, "accessof", authz_url,
                                           "--username", "groucho")
 
   # User groucho specified on /jokes with no repo, will not match any of the
   # repo specific sections, so is r since everyone has read access.
-  svntest.actions.run_and_verify_svnauthz("User access on path", ["r\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["r\n"], None,
                                           0, False, "accessof", authz_url,
                                           "--path", "/jokes", "--username",
                                           "groucho")
 
   # User groucho specified on /jokes with the repo comedy will be rw
-  svntest.actions.run_and_verify_svnauthz("User access on path with repo",
-                                          ["rw\n"], None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None, 0, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy")
@@ -341,29 +335,26 @@ def svnauthz_accessof_groups_file_test(s
 
   # Anonymous access with no path, and no repository should be no
   # since it returns the highest level of access granted anywhere.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access", ["no\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None,
                                           0, False, "accessof", authz_path,
                                           "--groups-file", groups_path)
 
   # User stafford (@musicians) access with no path, and no repository should
   # be no since it returns the highest level of access granted anywhere.
-  svntest.actions.run_and_verify_svnauthz("Group 1 access",
-                                          ["rw\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
                                           0, False, "accessof", authz_path,
                                           "--groups-file", groups_path,
                                           "--username", "stafford")
 
   # User groucho (@comedians) access with no path, and no repository should
   # be no since it returns the highest level of access granted anywhere.
-  svntest.actions.run_and_verify_svnauthz("Group 2 access",
-                                          ["no\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None,
                                           0, False, "accessof", authz_path,
                                           "--groups-file", groups_path,
                                           "--username", "groucho")
 
   # Anonymous access specified on /jokes with the repo comedy will be no.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
-                                          ["no\n"], None, 0, False,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False,
                                           "accessof", authz_path,
                                           "--groups-file", groups_path,
                                           "--path", "jokes",
@@ -371,8 +362,7 @@ def svnauthz_accessof_groups_file_test(s
 
   # User stafford (@musicians) specified on /jokes with the repo comedy
   # will be no.
-  svntest.actions.run_and_verify_svnauthz("Group 1 access on path with repo",
-                                          ["no\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None,
                                           0, False, "accessof", authz_path,
                                           "--groups-file", groups_path,
                                           "--path", "jokes",
@@ -381,8 +371,7 @@ def svnauthz_accessof_groups_file_test(s
 
   # User groucho (@comedians) specified on /jokes with the repo
   # comedy will be r.
-  svntest.actions.run_and_verify_svnauthz("Group 2 access on path with repo",
-                                          ["r\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["r\n"], None,
                                           0, False, "accessof", authz_path,
                                           "--groups-file", groups_path,
                                           "--path", "jokes",
@@ -431,29 +420,26 @@ def svnauthz_accessof_groups_repo_test(s
   # since it returns the highest level of access granted anywhere.
   authz_url = repo_url + "/A/authz"
   groups_url = repo_url + "/A/groups"
-  svntest.actions.run_and_verify_svnauthz("Anonymous access", ["no\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None,
                                           0, False, "accessof", authz_url,
                                           "--groups-file", groups_url)
 
   # User stafford (@musicians) access with no path, and no repository should
   # be no since it returns the highest level of access granted anywhere.
-  svntest.actions.run_and_verify_svnauthz("Group 1 access",
-                                          ["rw\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["rw\n"], None,
                                           0, False, "accessof", authz_url,
                                           "--groups-file", groups_url,
                                           "--username", "stafford")
 
   # User groucho (@comedians) access with no path, and no repository should
   # be no since it returns the highest level of access granted anywhere.
-  svntest.actions.run_and_verify_svnauthz("Group 2 access",
-                                          ["no\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None,
                                           0, False, "accessof", authz_url,
                                           "--groups-file", groups_url,
                                           "--username", "groucho")
 
   # Anonymous access specified on /jokes with the repo comedy will be no.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path with repo",
-                                          ["no\n"], None, 0, False,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None, 0, False,
                                           "accessof", authz_url,
                                           "--groups-file", groups_url,
                                           "--path", "jokes",
@@ -461,8 +447,7 @@ def svnauthz_accessof_groups_repo_test(s
 
   # User stafford (@musicians) specified on /jokes with the repo comedy
   # will be no.
-  svntest.actions.run_and_verify_svnauthz("Group 1 access on path with repo",
-                                          ["no\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["no\n"], None,
                                           0, False, "accessof", authz_url,
                                           "--groups-file", groups_url,
                                           "--path", "jokes",
@@ -471,8 +456,7 @@ def svnauthz_accessof_groups_repo_test(s
 
   # User groucho (@comedians) specified on /jokes with the repo
   # comedy will be r.
-  svntest.actions.run_and_verify_svnauthz("Group 2 access on path with repo",
-                                          ["r\n"], None,
+  svntest.actions.run_and_verify_svnauthz(["r\n"], None,
                                           0, False, "accessof", authz_url,
                                           "--groups-file", groups_url,
                                           "--path", "jokes",
@@ -495,7 +479,7 @@ def svnauthz_accessof_is_file_test(sbox)
   expected_output = svntest.verify.RegexOutput(
       ".*'x' is not a valid argument for --is", match_all=False
   )
-  svntest.actions.run_and_verify_svnauthz("--is x fails", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           expected_output, 2, False,
                                           "accessof", authz_path, "--is", "x")
 
@@ -503,52 +487,46 @@ def svnauthz_accessof_is_file_test(sbox)
   # since it returns the highest level of access granted anywhere.
   # So /bios being rw for everyone means this will be rw.
   # Test --is rw returns 0.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access --is rw", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 0, False, "accessof",
                                           authz_path, "--is", "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access --is r", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_path, "--is", "r")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access --is no", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_path, "--is", "no")
 
   # Anonymous access on /jokes should be r, no repo so won't match
   # the slapstick:/jokes section.
   # Test --is r returns 0.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
-                                          None, None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--is", "r")
   # Test --is rw returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--is", "rw")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--is", "no")
 
   # Anonymous access on /jokes on slapstick repo should be no
   # Test --is no returns 0.
-  svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
-                                          None, None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--repository", "slapstick",
                                           "--is", "no")
   # Test --is rw returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--repository", "slapstick",
                                           "--is", "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--repository", "slapstick",
                                           "--is", "r")
@@ -557,17 +535,17 @@ def svnauthz_accessof_is_file_test(sbox)
   # since it returns the h ighest level of access anywhere.
   # So /bios being rw for everyone means this will be rw.
   # Test --is rw returns 0.
-  svntest.actions.run_and_verify_svnauthz("User access --is rw", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           0, False, "accessof", authz_path,
                                           "--username", "groucho", "--is",
                                           "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access --is r", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           3, False, "accessof", authz_path,
                                           "--username", "groucho", "--is",
                                           "r")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access --is no", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           3, False, "accessof", authz_path,
                                           "--username", "groucho", "--is",
                                           "no")
@@ -575,18 +553,18 @@ def svnauthz_accessof_is_file_test(sbox)
   # User groucho specified on /jokes with no repo, will not match any of the
   # repo specific sections, so is r since everyone has read access.
   # Test --is r returns 0.
-  svntest.actions.run_and_verify_svnauthz("User access on path --is r", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 0, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--username", "groucho", "--is", "r")
   # Test --is rw returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path --is rw", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--is", "rw")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path --is no", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--username", "groucho",
@@ -594,22 +572,19 @@ def svnauthz_accessof_is_file_test(sbox)
 
   # User groucho specified on /jokes with the repo comedy will be rw
   # Test --is rw returns 0.
-  svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is rw",
-                                          None, None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy", "--is",
                                           "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is r",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy", "--is",
                                           "r")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is no",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_path, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy", "--is",
@@ -622,8 +597,7 @@ def svnauthz_accessof_is_file_test(sbox)
       ".*Error while parsing config file:",
       match_all=False
   )
-  svntest.actions.run_and_verify_svnauthz("--is with invalid authz file",
-                                          None, expected_out, 1, False,
+  svntest.actions.run_and_verify_svnauthz(None, expected_out, 1, False,
                                           "accessof", authz_path, "--path",
                                           "/jokes", "--username", "groucho",
                                           "--repository", "comedy", "--is",
@@ -664,7 +638,7 @@ def svnauthz_accessof_is_repo_test(sbox)
   expected_output = svntest.verify.RegexOutput(
       ".*'x' is not a valid argument for --is", match_all=False
   )
-  svntest.actions.run_and_verify_svnauthz("--is x fails", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           expected_output, 2, False,
                                           "accessof", authz_url, "--is", "x")
 
@@ -672,52 +646,46 @@ def svnauthz_accessof_is_repo_test(sbox)
   # since it returns the highest level of access granted anywhere.
   # So /bios being rw for everyone means this will be rw.
   # Test --is rw returns 0.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access --is rw", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 0, False, "accessof",
                                           authz_url, "--is", "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access --is r", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_url, "--is", "r")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access --is no", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_url, "--is", "no")
 
   # Anonymous access on /jokes should be r, no repo so won't match
   # the slapstick:/jokes section.
   # Test --is r returns 0.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
-                                          None, None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--is", "r")
   # Test --is rw returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--is", "rw")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anonymous access on path --is r",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--is", "no")
 
   # Anonymous access on /jokes on slapstick repo should be no
   # Test --is no returns 0.
-  svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
-                                          None, None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--repository", "slapstick",
                                           "--is", "no")
   # Test --is rw returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--repository", "slapstick",
                                           "--is", "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("Anon access on path w/ repo --is no",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--repository", "slapstick",
                                           "--is", "r")
@@ -726,17 +694,17 @@ def svnauthz_accessof_is_repo_test(sbox)
   # since it returns the h ighest level of access anywhere.
   # So /bios being rw for everyone means this will be rw.
   # Test --is rw returns 0.
-  svntest.actions.run_and_verify_svnauthz("User access --is rw", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           0, False, "accessof", authz_url,
                                           "--username", "groucho", "--is",
                                           "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access --is r", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           3, False, "accessof", authz_url,
                                           "--username", "groucho", "--is",
                                           "r")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access --is no", None, None,
+  svntest.actions.run_and_verify_svnauthz(None, None,
                                           3, False, "accessof", authz_url,
                                           "--username", "groucho", "--is",
                                           "no")
@@ -744,18 +712,18 @@ def svnauthz_accessof_is_repo_test(sbox)
   # User groucho specified on /jokes with no repo, will not match any of the
   # repo specific sections, so is r since everyone has read access.
   # Test --is r returns 0.
-  svntest.actions.run_and_verify_svnauthz("User access on path --is r", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 0, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--username", "groucho", "--is", "r")
   # Test --is rw returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path --is rw", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--is", "rw")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path --is no", None,
+  svntest.actions.run_and_verify_svnauthz(None,
                                           None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--username", "groucho",
@@ -763,22 +731,19 @@ def svnauthz_accessof_is_repo_test(sbox)
 
   # User groucho specified on /jokes with the repo comedy will be rw
   # Test --is rw returns 0.
-  svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is rw",
-                                          None, None, 0, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy", "--is",
                                           "rw")
   # Test --is r returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is r",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy", "--is",
                                           "r")
   # Test --is no returns 3.
-  svntest.actions.run_and_verify_svnauthz("User access on path w/ repo --is no",
-                                          None, None, 3, False, "accessof",
+  svntest.actions.run_and_verify_svnauthz(None, None, 3, False, "accessof",
                                           authz_url, "--path", "/jokes",
                                           "--username", "groucho",
                                           "--repository", "comedy", "--is",
@@ -797,8 +762,7 @@ def svnauthz_accessof_is_repo_test(sbox)
       ".*Error while parsing config file:",
       match_all=False
   )
-  svntest.actions.run_and_verify_svnauthz("--is with invalid authz url",
-                                          None, expected_out, 1, False,
+  svntest.actions.run_and_verify_svnauthz(None, expected_out, 1, False,
                                           "accessof", authz_url, "--path",
                                           "/jokes", "--username", "groucho",
                                           "--repository", "comedy", "--is",
@@ -883,14 +847,12 @@ def svnauthz_compat_mode_file_test(sbox)
   svntest.main.file_write(authz_path, authz_content)
 
   # Check a valid file.
-  svntest.actions.run_and_verify_svnauthz("svnauthz-validate on file",
-                                          None, None, 0, True,
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, True,
                                           authz_path)
 
   # Check an invalid file.
   svntest.main.file_append(authz_path, "x\n")
-  svntest.actions.run_and_verify_svnauthz("svnauthz-validate on invalid file",
-                                          None, None, 1, True,
+  svntest.actions.run_and_verify_svnauthz(None, None, 1, True,
                                           authz_path)
 
   # Remove the file.
@@ -899,7 +861,7 @@ def svnauthz_compat_mode_file_test(sbox)
 
   # Check a non-existent file.
   svntest.actions.run_and_verify_svnauthz(
-      "svnauthz-validate on non-existent file", None, None, 2, True,
+      None, None, 2, True,
       authz_path
   )
 
@@ -928,8 +890,7 @@ def svnauthz_compat_mode_repo_test(sbox)
   if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                            expected_status, None, wc_dir):
     raise svntest.Failure
-  svntest.actions.run_and_verify_svnauthz("svnauthz-validate on url",
-                                          None, None, 0, True,
+  svntest.actions.run_and_verify_svnauthz(None, None, 0, True,
                                           authz_url)
 
   # Check an invalid url.
@@ -939,14 +900,13 @@ def svnauthz_compat_mode_repo_test(sbox)
   if svntest.actions.run_and_verify_commit(wc_dir, expected_output,
                                            expected_status, None, wc_dir):
     raise svntest.Failure
-  svntest.actions.run_and_verify_svnauthz("svnauthz-validate on invalid file",
-                                          None, None, 1, True,
+  svntest.actions.run_and_verify_svnauthz(None, None, 1, True,
                                           authz_path)
 
   # Check a non-existent url.
   # Exit code really should be 2 since this is an operational error.
   svntest.actions.run_and_verify_svnauthz(
-      "svnauthz-validate on non-existent file", None, None, 2, True,
+      None, None, 2, True,
       repo_url + "/zilch"
   )
 

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/svndumpfilter_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/svndumpfilter_tests.py?rev=1659291&r1=1659290&r2=1659291&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/svndumpfilter_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/svndumpfilter_tests.py Thu Feb 12 15:50:47 2015
@@ -106,7 +106,7 @@ def reflect_dropped_renumbered_revs(sbox
   expected_output = svntest.verify.UnorderedOutput([
     url + "/trunk - /branch1:4-5\n",
     ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -125,7 +125,7 @@ def reflect_dropped_renumbered_revs(sbox
   expected_output = svntest.verify.UnorderedOutput([
     url + "/trunk - \n",
     ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -152,7 +152,7 @@ def svndumpfilter_loses_mergeinfo(sbox):
   expected_output = svntest.verify.UnorderedOutput([
     url + "/trunk - /branch1:4-8\n",
     ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -351,7 +351,7 @@ def filter_mergeinfo_revs_outside_of_dum
     url + "/B2 - /trunk:4\n",
     url + "/B1/B/E - /branches/B2/B/E:6-7\n",
     "/trunk/B/E:3-4\n"])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -478,7 +478,7 @@ def filter_mergeinfo_revs_outside_of_dum
   expected_output = svntest.verify.UnorderedOutput([
     url + "/B1 - /Projects/Project-X/trunk:9\n",
     url + "/B1/B/E - /Projects/Project-X/trunk/B/E:8-9\n"])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 
@@ -584,7 +584,7 @@ def dropped_but_not_renumbered_empty_rev
   expected_output = svntest.verify.UnorderedOutput([
     url + "/B1 - /trunk:6,8\n",
     url + "/B1/B/E - /trunk/B/E:5-8\n"])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'propget', 'svn:mergeinfo', '-R',
                                      sbox.repo_url)
 

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnlook_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnlook_tests.py?rev=1659291&r1=1659290&r2=1659291&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnlook_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnlook_tests.py Thu Feb 12 15:50:47 2015
@@ -209,9 +209,9 @@ def delete_file_in_moved_dir(sbox):
   # move E to E2 and delete E2/alpha
   E_path = os.path.join(wc_dir, 'A', 'B', 'E')
   E2_path = os.path.join(wc_dir, 'A', 'B', 'E2')
-  svntest.actions.run_and_verify_svn(None, None, [], 'mv', E_path, E2_path)
+  svntest.actions.run_and_verify_svn(None, [], 'mv', E_path, E2_path)
   alpha_path = os.path.join(E2_path, 'alpha')
-  svntest.actions.run_and_verify_svn(None, None, [], 'rm', alpha_path)
+  svntest.actions.run_and_verify_svn(None, [], 'rm', alpha_path)
 
   # commit
   expected_output = svntest.wc.State(wc_dir, {
@@ -263,16 +263,16 @@ def test_print_property_diffs(sbox):
 
   # Add a bogus property to iota
   iota_path = os.path.join(wc_dir, 'iota')
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      'bogus_prop', 'bogus_val', iota_path)
 
   # commit the change
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg', iota_path)
 
   # Grab the diff
   exit_code, expected_output, err = svntest.actions.run_and_verify_svn(
-    None, None, [], 'diff', '-r', 'PREV', iota_path)
+    None, [], 'diff', '-r', 'PREV', iota_path)
 
   exit_code, output, errput = svntest.main.run_svnlook("diff", repo_dir)
   if errput:
@@ -370,7 +370,7 @@ def changed_copy_info(sbox):
   E_path = os.path.join(wc_dir, 'A', 'B', 'E')
   alpha_path = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
   alpha2_path = os.path.join(wc_dir, 'A', 'alpha2')
-  svntest.actions.run_and_verify_svn(None, None, [], 'cp', alpha_path,
+  svntest.actions.run_and_verify_svn(None, [], 'cp', alpha_path,
                                      alpha2_path)
 
   # commit
@@ -446,10 +446,10 @@ def limit_history(sbox):
   "history --limit"
   sbox.build(create_wc=False)
   repo_url = sbox.repo_url
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mv', '-m', 'log msg',
                                      repo_url + "/iota", repo_url + "/iota2")
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'mv', '-m', 'log msg',
                                      repo_url + "/A/mu", repo_url + "/iota")
   history = run_svnlook("history", "--limit=1", sbox.repo_dir)
@@ -542,7 +542,7 @@ def diff_ignore_eolstyle(sbox):
 
     # Grab the diff
     exit_code, expected_output, err = svntest.actions.run_and_verify_svn(
-      None, None, [],
+      None, [],
       'diff', '-r', 'PREV', '-x', '--ignore-eol-style', mu_path)
 
 
@@ -676,9 +676,9 @@ fp.close()"""
   svntest.main.file_append(rho_path, 'new appended text for rho')
 
   # commit, and check the hook's logfile
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg', wc_dir)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'up', wc_dir)
 
   expected_data = [ 'U   A/D/G/rho\n', 'U   A/mu\n', 'A/\n', 'A/D/G/\n' ]
@@ -694,9 +694,9 @@ fp.close()"""
   svntest.main.create_python_hook_script(pre_commit_hook,
                                          hook_instance)
 
-  svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+  svntest.actions.run_and_verify_svn(None, [], 'propset',
                                      'bogus_prop', 'bogus_val\n', A_path)
-  svntest.actions.run_and_verify_svn(None, None, [],
+  svntest.actions.run_and_verify_svn(None, [],
                                      'ci', '-m', 'log msg', wc_dir,
                                      '--with-revprop', 'bogus_rev_prop=bogus_rev_val\n')
   # Now check the logfile
@@ -726,7 +726,7 @@ def property_delete(sbox):
   sbox.simple_propdel('foo', 'A/mu')
   sbox.simple_commit()
 
-  svntest.actions.run_and_verify_svnlook(None, ["_U  A/mu\n"], [],
+  svntest.actions.run_and_verify_svnlook(["_U  A/mu\n"], [],
                                          'changed', repo_dir)
 
 

Modified: subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnmucc_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnmucc_tests.py?rev=1659291&r1=1659290&r2=1659291&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnmucc_tests.py (original)
+++ subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnmucc_tests.py Thu Feb 12 15:50:47 2015
@@ -43,7 +43,7 @@ def reject_bogus_mergeinfo(sbox):
 
   # At present this tests the server, but if we ever make svnmucc
   # validate the mergeinfo up front then it will only test the client
-  svntest.actions.run_and_verify_svnmucc(None, [], expected_error,
+  svntest.actions.run_and_verify_svnmucc([], expected_error,
                                          'propset', 'svn:mergeinfo', '/B:0',
                                          '-m', 'log msg',
                                          sbox.repo_url + '/A')
@@ -340,20 +340,20 @@ def basic_svnmucc(sbox):
 
 def propset_root_internal(sbox, target):
   ## propset on ^/
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                                          '-m', 'log msg',
                                          'propset', 'foo', 'bar',
                                          target)
-  svntest.actions.run_and_verify_svn(None, 'bar', [],
+  svntest.actions.run_and_verify_svn('bar', [],
                                      'propget', '--strict', 'foo',
                                      target)
 
   ## propdel on ^/
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                                          '-m', 'log msg',
                                          'propdel', 'foo',
                                          target)
-  svntest.actions.run_and_verify_svn(None, [],
+  svntest.actions.run_and_verify_svn([],
                                      '.*W200017: Property.*not found',
                                      'propget', '--strict', 'foo',
                                      target)
@@ -416,14 +416,14 @@ def nested_replaces(sbox):
 
   sbox.build(create_wc=False)
   repo_url = sbox.repo_url
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                            '-U', repo_url, '-m', 'r2: create tree',
                            'rm', 'A',
                            'rm', 'iota',
                            'mkdir', 'A', 'mkdir', 'A/B', 'mkdir', 'A/B/C',
                            'mkdir', 'M', 'mkdir', 'M/N', 'mkdir', 'M/N/O',
                            'mkdir', 'X', 'mkdir', 'X/Y', 'mkdir', 'X/Y/Z')
-  svntest.actions.run_and_verify_svnmucc(None, None, [],
+  svntest.actions.run_and_verify_svnmucc(None, [],
                            '-U', repo_url, '-m', 'r3: nested replaces',
                            *("""
 rm A rm M rm X
@@ -449,7 +449,7 @@ rm A/B/C/Y
   ]) + [
     '^-', '^r3', '^-', '^Changed paths:',
   ])
-  svntest.actions.run_and_verify_svn(None, expected_output, [],
+  svntest.actions.run_and_verify_svn(expected_output, [],
                                      'log', '-qvr3', repo_url)
 
 



Mime
View raw message