You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/02/11 14:29:28 UTC
svn commit: r1658954 [20/22] - in /subversion/branches/reuse-ra-session: ./
build/generator/ build/generator/templates/
subversion/bindings/javahl/native/
subversion/bindings/javahl/native/jniwrapper/ subversion/bindings/swig/
subversion/include/ subve...
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnrdump_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnrdump_tests.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnrdump_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnrdump_tests.py Wed Feb 11 13:29:26 2015
@@ -166,7 +166,7 @@ def run_load_test(sbox, dumpfile_name, e
# Set the UUID of the sbox repository to the UUID specified in the
# dumpfile ### RA layer doesn't have a set_uuid functionality
uuid = original_dumpfile[2].split(' ')[1][:-1]
- svntest.actions.run_and_verify_svnadmin2("Setting UUID", None, None, 0,
+ svntest.actions.run_and_verify_svnadmin2(None, None, 0,
'setuuid', sbox.repo_dir,
uuid)
@@ -422,7 +422,7 @@ def reflect_dropped_renumbered_revs(sbox
# Create the 'toplevel' directory in repository and then load the same
# dumpfile into that subtree.
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 10.\n'],
[], "mkdir", sbox.repo_url + "/toplevel",
"-m", "Create toplevel dir to load into")
@@ -436,7 +436,7 @@ def reflect_dropped_renumbered_revs(sbox
url + "/trunk - /branch1:4-8\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)
@@ -534,7 +534,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)
@@ -596,7 +596,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)
@@ -660,7 +660,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)
@@ -702,7 +702,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)
@@ -719,7 +719,7 @@ def svnrdump_load_partial_incremental_du
# Create the 'A' directory in repository and then load the partial
# incremental dump into the root of the repository.
- 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 + "/A",
"-m", "Create toplevel dir to load into")
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_authz_tests.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_authz_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_authz_tests.py Wed Feb 11 13:29:26 2015
@@ -83,13 +83,11 @@ def basic_authz(sbox):
iota_url = dest_sbox.repo_url + '/iota'
# this file should have been blocked by authz
- svntest.actions.run_and_verify_svn(None,
- [], svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn([], svntest.verify.AnyOutput,
'cat',
lambda_url)
# this file should have been synced
- svntest.actions.run_and_verify_svn(None,
- svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
'cat',
iota_url)
@@ -106,7 +104,6 @@ def copy_from_unreadable_dir(sbox):
# Set a property on the directory we're going to copy, and a file in it, to
# confirm that they're transmitted when we later sync the copied directory
svntest.actions.run_and_verify_svn(None,
- None,
[],
'pset',
'foo',
@@ -114,7 +111,6 @@ def copy_from_unreadable_dir(sbox):
sbox.wc_dir + '/A/B/lambda')
svntest.actions.run_and_verify_svn(None,
- None,
[],
'pset',
'baz',
@@ -122,7 +118,6 @@ def copy_from_unreadable_dir(sbox):
sbox.wc_dir + '/A/B')
svntest.actions.run_and_verify_svn(None,
- None,
[],
'ci',
sbox.wc_dir + '/A/B',
@@ -130,7 +125,6 @@ def copy_from_unreadable_dir(sbox):
# Now copy that directory so we'll see it in our synced copy
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
B_url,
@@ -183,15 +177,13 @@ def copy_from_unreadable_dir(sbox):
expected_out,
out[2:11])
- svntest.actions.run_and_verify_svn(None,
- ['bar\n'],
+ svntest.actions.run_and_verify_svn(['bar\n'],
[],
'pget',
'foo',
dest_sbox.repo_url + '/A/P/lambda')
- svntest.actions.run_and_verify_svn(None,
- ['zot\n'],
+ svntest.actions.run_and_verify_svn(['zot\n'],
[],
'pget',
'baz',
@@ -207,7 +199,6 @@ def copy_with_mod_from_unreadable_dir(sb
# Make a copy of the B directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
sbox.wc_dir + '/A/B',
@@ -215,7 +206,6 @@ def copy_with_mod_from_unreadable_dir(sb
# Set a property inside the copied directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'pset',
'foo',
@@ -224,7 +214,6 @@ def copy_with_mod_from_unreadable_dir(sb
# Add a new directory and file inside the copied directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'mkdir',
sbox.wc_dir + '/A/P/NEW-DIR')
@@ -234,14 +223,12 @@ def copy_with_mod_from_unreadable_dir(sb
# Delete a file inside the copied directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'rm',
sbox.wc_dir + '/A/P/E/beta')
# Commit the copy-with-modification.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'ci',
sbox.wc_dir,
@@ -295,8 +282,7 @@ def copy_with_mod_from_unreadable_dir(sb
expected_out,
out[2:12])
- svntest.actions.run_and_verify_svn(None,
- ['bar\n'],
+ svntest.actions.run_and_verify_svn(['bar\n'],
[],
'pget',
'foo',
@@ -312,7 +298,6 @@ def copy_with_mod_from_unreadable_dir_an
# Make a copy of the B directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
sbox.wc_dir + '/A/B',
@@ -321,7 +306,6 @@ def copy_with_mod_from_unreadable_dir_an
# Copy a (readable) file into the copied directory.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'cp',
sbox.wc_dir + '/A/D/gamma',
@@ -330,7 +314,6 @@ def copy_with_mod_from_unreadable_dir_an
# Commit the copy-with-modification.
svntest.actions.run_and_verify_svn(None,
- None,
[],
'ci',
sbox.wc_dir,
@@ -457,8 +440,7 @@ def specific_deny_authz(sbox):
lambda_url = dest_sbox.repo_url + '/A_COPY/B/lambda'
# this file should have been blocked by authz
- svntest.actions.run_and_verify_svn(None,
- [], svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn([], svntest.verify.AnyOutput,
'cat',
lambda_url)
@@ -469,7 +451,7 @@ def copy_delete_unreadable_child(sbox):
# Prepare the source: Greek tree (r1), cp+rm (r2).
sbox.build(create_wc = False)
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-m', 'r2',
'-U', sbox.repo_url,
'cp', 'HEAD', '/', 'branch',
@@ -495,8 +477,7 @@ def copy_delete_unreadable_child(sbox):
run_sync(dest_url)
# sanity check
- svntest.actions.run_and_verify_svn(None,
- ["iota\n"], [],
+ svntest.actions.run_and_verify_svn(["iota\n"], [],
'ls', dest_url+'/branch@2')
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_tests.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnsync_tests.py Wed Feb 11 13:29:26 2015
@@ -121,7 +121,7 @@ def setup_and_sync(sbox, dump_file_conte
# Setup the mirror repository. Feed it the UUID of the source repository.
exit_code, output, errput = svntest.main.run_svnlook("uuid", sbox.repo_dir)
- svntest.actions.run_and_verify_svnadmin2("Setting UUID", None, None, 0,
+ svntest.actions.run_and_verify_svnadmin2(None, None, 0,
'setuuid', dest_sbox.repo_dir,
output[0][:-1])
@@ -162,7 +162,7 @@ def verify_mirror(dest_sbox, exp_dump_fi
for prop_name in ("svn:sync-from-url", "svn:sync-from-uuid",
"svn:sync-last-merged-rev"):
svntest.actions.run_and_verify_svn(
- None, None, [], "propdel", "--revprop", "-r", "0",
+ None, [], "propdel", "--revprop", "-r", "0",
prop_name, dest_sbox.repo_url)
# Create a dump file from the mirror repository.
@@ -294,7 +294,6 @@ def detect_meddling(sbox):
svntest.main.safe_rmtree(dest_sbox.wc_dir)
svntest.actions.run_and_verify_svn(None,
- None,
[],
'co',
dest_sbox.repo_url,
@@ -306,7 +305,6 @@ def detect_meddling(sbox):
run_sync(dest_sbox.repo_url)
svntest.actions.run_and_verify_svn(None,
- None,
[],
'up',
dest_sbox.wc_dir)
@@ -315,7 +313,6 @@ def detect_meddling(sbox):
svntest.main.file_append(os.path.join(dest_sbox.wc_dir, 'A', 'B', 'lambda'),
'new lambda text')
svntest.actions.run_and_verify_svn(None,
- None,
[],
'ci',
'-m', 'msg',
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/actions.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/actions.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/actions.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/actions.py Wed Feb 11 13:29:26 2015
@@ -169,10 +169,9 @@ def guarantee_greek_repository(path, min
main.chmod_tree(path, 0666, 0666)
# give the repository a unique UUID
- run_and_verify_svnadmin("could not set uuid", [], [], 'setuuid', path)
+ run_and_verify_svnadmin([], [], 'setuuid', path)
-def run_and_verify_atomic_ra_revprop_change(message,
- expected_stdout,
+def run_and_verify_atomic_ra_revprop_change(expected_stdout,
expected_stderr,
expected_exit,
url, revision, propname,
@@ -202,11 +201,11 @@ def run_and_verify_atomic_ra_revprop_cha
want_error)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svnlook(message, expected_stdout,
+def run_and_verify_svnlook(expected_stdout,
expected_stderr, *varargs):
"""Like run_and_verify_svnlook2, but the expected exit code is
assumed to be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -214,21 +213,21 @@ def run_and_verify_svnlook(message, expe
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnlook2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svnlook2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnlook2(message, expected_stdout, expected_stderr,
+def run_and_verify_svnlook2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnlook command and check its output and exit code."""
exit_code, out, err = main.run_svnlook(*varargs)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svnadmin(message, expected_stdout,
+def run_and_verify_svnadmin(expected_stdout,
expected_stderr, *varargs):
"""Like run_and_verify_svnadmin2, but the expected exit code is
assumed to be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -236,21 +235,21 @@ def run_and_verify_svnadmin(message, exp
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnadmin2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svnadmin2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnadmin2(message, expected_stdout, expected_stderr,
+def run_and_verify_svnadmin2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnadmin command and check its output and exit code."""
exit_code, out, err = main.run_svnadmin(*varargs)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svnversion(message, wc_dir, trail_url,
+def run_and_verify_svnversion(wc_dir, trail_url,
expected_stdout, expected_stderr, *varargs):
"""like run_and_verify_svnversion2, but the expected exit code is
assumed to be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -258,11 +257,11 @@ def run_and_verify_svnversion(message, w
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnversion2(message, wc_dir, trail_url,
+ return run_and_verify_svnversion2(wc_dir, trail_url,
expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnversion2(message, wc_dir, trail_url,
+def run_and_verify_svnversion2(wc_dir, trail_url,
expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnversion command and check its output and exit code."""
@@ -274,10 +273,10 @@ def run_and_verify_svnversion2(message,
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
-def run_and_verify_svn(message, expected_stdout, expected_stderr, *varargs):
+def run_and_verify_svn(expected_stdout, expected_stderr, *varargs):
"""like run_and_verify_svn2, but the expected exit code is assumed to
be 0 if no output is expected on stderr, and 1 otherwise."""
@@ -288,10 +287,10 @@ def run_and_verify_svn(message, expected
expected_exit = 1
elif expected_stderr != []:
expected_exit = 1
- return run_and_verify_svn2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svn2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svn2(message, expected_stdout, expected_stderr,
+def run_and_verify_svn2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Invoke main.run_svn() with *VARARGS. Return exit code as int; stdout,
stderr as lists of lines (including line terminators). For both
@@ -306,7 +305,7 @@ def run_and_verify_svn2(message, expecte
- If it is already an instance of ExpectedOutput
(e.g. UnorderedOutput), leave it alone.
- ...and invoke compare_and_display_lines() on MESSAGE, a label based
+ ...and invoke compare_and_display_lines() on a label based
on the name of the stream being compared (e.g. STDOUT), the
ExpectedOutput instance, and the actual output.
@@ -328,8 +327,9 @@ def run_and_verify_svn2(message, expecte
want_err = True
exit_code, out, err = main.run_svn(want_err, *varargs)
- verify.verify_outputs(message, out, err, expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_outputs("Unexpected output", out, err,
+ expected_stdout, expected_stderr)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
def run_and_verify_load(repo_dir, dump_file_content,
@@ -352,7 +352,7 @@ def run_and_verify_dump(repo_dir, deltas
if deltas:
args += ('--deltas',)
exit_code, output, errput = run_and_verify_svnadmin(
- None, verify.AnyOutput, [],
+ verify.AnyOutput, [],
'dump', '--quiet', repo_dir, *args)
return output
@@ -380,24 +380,24 @@ def run_and_verify_svnrdump(dumpfile_con
return output
-def run_and_verify_svnmucc(message, expected_stdout, expected_stderr,
+def run_and_verify_svnmucc(expected_stdout, expected_stderr,
*varargs):
"""Run svnmucc command and check its output"""
expected_exit = 0
if expected_stderr is not None and expected_stderr != []:
expected_exit = 1
- return run_and_verify_svnmucc2(message, expected_stdout, expected_stderr,
+ return run_and_verify_svnmucc2(expected_stdout, expected_stderr,
expected_exit, *varargs)
-def run_and_verify_svnmucc2(message, expected_stdout, expected_stderr,
+def run_and_verify_svnmucc2(expected_stdout, expected_stderr,
expected_exit, *varargs):
"""Run svnmucc command and check its output and exit code."""
exit_code, out, err = main.run_svnmucc(*varargs)
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
@@ -443,7 +443,7 @@ def load_repo(sbox, dumpfile_path = None
# Load the mergetracking dumpfile into the repos, and check it out the repo
run_and_verify_load(sbox.repo_dir, dump_str.splitlines(True),
bypass_prop_validation)
- run_and_verify_svn(None, None, [], "co", sbox.repo_url, sbox.wc_dir)
+ run_and_verify_svn(None, [], "co", sbox.repo_url, sbox.wc_dir)
return dump_str
@@ -455,7 +455,7 @@ def expected_noop_update_output(rev):
% (rev),
"no-op update")
-def run_and_verify_svnauthz(message, expected_stdout, expected_stderr,
+def run_and_verify_svnauthz(expected_stdout, expected_stderr,
expected_exit, compat_mode, *varargs):
"""Run svnauthz command and check its output and exit code.
If COMPAT_MODE is True then run the command in pre-1.8
@@ -468,7 +468,7 @@ def run_and_verify_svnauthz(message, exp
verify.verify_outputs("Unexpected output", out, err,
expected_stdout, expected_stderr)
- verify.verify_exit_code(message, exit_code, expected_exit)
+ verify.verify_exit_code("Unexpected return code", exit_code, expected_exit)
return exit_code, out, err
######################################################################
@@ -717,14 +717,12 @@ class LogParser:
self.entries[-1].changed_paths[self.use_cdata()] = [{'kind': self.kind,
'action': self.action}]
-def run_and_verify_log_xml(message=None, expected_log_attrs=None,
+def run_and_verify_log_xml(expected_log_attrs=None,
expected_paths=None, expected_revprops=None,
expected_stdout=None, expected_stderr=None,
args=[]):
"""Call run_and_verify_svn with log --xml and args (optional) as command
- arguments, and pass along message, expected_stdout, and expected_stderr.
-
- If message is None, pass the svn log command as message.
+ arguments, and pass along expected_stdout, and expected_stderr.
expected_paths checking is not yet implemented.
@@ -740,8 +738,7 @@ def run_and_verify_log_xml(message=None,
expected_paths and expected_revprops are ignored if expected_stdout or
expected_stderr is specified.
"""
- if message == None:
- message = ' '.join(args)
+ message = ' '.join(args)
# We'll parse the output unless the caller specifies expected_stderr or
# expected_stdout for run_and_verify_svn.
@@ -758,7 +755,7 @@ def run_and_verify_log_xml(message=None,
log_args.append('-v')
(exit_code, stdout, stderr) = run_and_verify_svn(
- message, expected_stdout, expected_stderr,
+ expected_stdout, expected_stderr,
'log', '--xml', *log_args)
if not parse:
return
@@ -1597,7 +1594,7 @@ def run_and_verify_status_xml(expected_e
EXPECTED_ENTRIES.
"""
- exit_code, output, errput = run_and_verify_svn(None, None, [],
+ exit_code, output, errput = run_and_verify_svn(None, [],
'status', '--xml', *args)
if len(errput) > 0:
@@ -1669,11 +1666,11 @@ def run_and_verify_inherited_prop_xml(pa
if (propname):
exit_code, output, errput = svntest.actions.run_and_verify_svn(
- None, None, [], 'propget', propname, '--xml',
+ None, [], 'propget', propname, '--xml',
'--show-inherited-props', path_or_url, *args)
else:
exit_code, output, errput = svntest.actions.run_and_verify_svn(
- None, None, [], 'proplist', '-v', '--xml', '--show-inherited-props',
+ None, [], 'proplist', '-v', '--xml', '--show-inherited-props',
path_or_url, *args)
if len(errput) > 0:
@@ -1746,7 +1743,7 @@ def run_and_verify_diff_summarize_xml(er
EXPECTED_PROPS and EXPECTED_KINDS. Returns on success, raises
on failure."""
- exit_code, output, errput = run_and_verify_svn(None, None, error_re_string,
+ exit_code, output, errput = run_and_verify_svn(None, error_re_string,
'diff', '--summarize',
'--xml', *args)
@@ -1830,12 +1827,12 @@ def run_and_validate_lock(path, username
comment = "Locking path:%s." % path
# lock the path
- run_and_verify_svn(None, ".*locked by user", [], 'lock',
+ run_and_verify_svn(".*locked by user", [], 'lock',
'--username', username,
'-m', comment, path)
# Run info and check that we get the lock fields.
- exit_code, output, err = run_and_verify_svn(None, None, [],
+ exit_code, output, err = run_and_verify_svn(None, [],
'info','-R',
path)
@@ -1873,7 +1870,7 @@ def _run_and_verify_resolve(cmd, expecte
expected_paths]),
],
match_all=False)
- run_and_verify_svn(None, expected_output, [],
+ run_and_verify_svn(expected_output, [],
cmd, *args)
def run_and_verify_resolve(expected_paths, *args):
@@ -1897,7 +1894,7 @@ def run_and_verify_revert(expected_paths
expected_output = verify.UnorderedOutput([
"Reverted '" + path + "'\n" for path in
expected_paths])
- run_and_verify_svn(None, expected_output, [],
+ run_and_verify_svn(expected_output, [],
"revert", *args)
@@ -2293,6 +2290,6 @@ def build_greek_tree_conflicts(sbox):
# Update, receiving the incoming changes on top of the local changes,
# causing tree conflicts. Don't check for any particular result: that is
# the job of other tests.
- run_and_verify_svn(None, verify.AnyOutput, [], 'update', wc_dir)
+ run_and_verify_svn(verify.AnyOutput, [], 'update', wc_dir)
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/deeptrees.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/deeptrees.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/deeptrees.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/deeptrees.py Wed Feb 11 13:29:26 2015
@@ -123,13 +123,13 @@ def deep_trees_leaf_edit(base):
main.file_append(F, "More text for file alpha.\n")
main.file_append(DF, "More text for file beta.\n")
main.file_append(DDF, "More text for file gamma.\n")
- run_and_verify_svn(None, verify.AnyOutput, [],
+ run_and_verify_svn(verify.AnyOutput, [],
'propset', 'prop1', '1', F, DF, DDF)
D = j(base, 'D', 'D1')
DD = j(base, 'DD', 'D1', 'D2')
DDD = j(base, 'DDD', 'D1', 'D2', 'D3')
- run_and_verify_svn(None, verify.AnyOutput, [],
+ run_and_verify_svn(verify.AnyOutput, [],
'propset', 'prop1', '1', D, DD, DDD)
D = j(base, 'D', 'D1', 'delta')
DD = j(base, 'DD', 'D1', 'D2', 'epsilon')
@@ -137,7 +137,7 @@ def deep_trees_leaf_edit(base):
main.file_append(D, "This is the file 'delta'.\n")
main.file_append(DD, "This is the file 'epsilon'.\n")
main.file_append(DDD, "This is the file 'zeta'.\n")
- run_and_verify_svn(None, verify.AnyOutput, [],
+ run_and_verify_svn(verify.AnyOutput, [],
'add', D, DD, DDD)
# deep trees state after a call to deep_trees_leaf_edit
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/factory.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/factory.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/factory.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/factory.py Wed Feb 11 13:29:26 2015
@@ -500,7 +500,7 @@ class TestFactory:
else:
py = "expected_stdout = verify.UnorderedOutput(" + pylist + ")\n\n"
py += pychdir
- py += "actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0"
+ py += "actions.run_and_verify_svn2(expected_stdout, [], 0"
else:
# write a test that expects failure
pylist = self.strlist2py(err)
@@ -509,8 +509,7 @@ class TestFactory:
else:
py = "expected_stderr = verify.UnorderedOutput(" + pylist + ")\n\n"
py += pychdir
- py += ("actions.run_and_verify_svn2('OUTPUT', " +
- "[], expected_stderr, " + str(code))
+ py += ("actions.run_and_verify_svn2([], expected_stderr, " + str(code))
if len(pyargs) > 0:
py += ", " + ", ".join(pyargs)
@@ -775,8 +774,7 @@ class TestFactory:
else:
py += "expected_stderr = verify.UnorderedOutput(" + pylist + ")\n\n"
py += pychdir
- py += ("actions.run_and_verify_svn2('OUTPUT', " +
- "[], expected_stderr, " + str(code) +
+ py += ("actions.run_and_verify_svn2([], expected_stderr, " + str(code) +
", " + url_arg.pyarg + ", " + wc_arg.pyarg)
# Append the remaining args
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/mergetrees.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/mergetrees.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/mergetrees.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/mergetrees.py Wed Feb 11 13:29:26 2015
@@ -122,7 +122,7 @@ def check_mergeinfo_recursively(root_pat
expected = verify.UnorderedOutput(
[path + ' - ' + subpaths_mergeinfo[path] + '\n'
for path in subpaths_mergeinfo])
- actions.run_and_verify_svn(None, expected, [],
+ actions.run_and_verify_svn(expected, [],
'propget', '-R', SVN_PROP_MERGEINFO,
root_path)
@@ -146,7 +146,7 @@ def set_up_dir_replace(sbox):
new_file2 = os.path.join(foo_path, "new file 2")
# Make directory foo in F, and add some files within it.
- actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
+ actions.run_and_verify_svn(None, [], 'mkdir', foo_path)
main.file_append(new_file, "Initial text in new file.\n")
main.file_append(new_file2, "Initial text in new file 2.\n")
main.run_svn(None, "add", new_file)
@@ -223,7 +223,7 @@ def set_up_dir_replace(sbox):
None, wc_dir)
# Delete foo on F, creating r4.
- actions.run_and_verify_svn(None, None, [], 'rm', foo_path)
+ actions.run_and_verify_svn(None, [], 'rm', foo_path)
expected_output = wc.State(wc_dir, {
'A/B/F/foo' : Item(verb='Deleting'),
})
@@ -327,7 +327,7 @@ def set_up_branch(sbox, branch_only = Fa
})
# Make a branch A_COPY to merge into.
- actions.run_and_verify_svn(None, expected, [], 'copy',
+ actions.run_and_verify_svn(expected, [], 'copy',
sbox.repo_url + "/A",
os.path.join(wc_dir,
dest_name))
@@ -400,22 +400,22 @@ def svn_mkfile(path):
dirname, filename = os.path.split(path)
main.file_write(path, "This is the file '" + filename + "'.\n" +
"Last changed in '$Revision$'.\n")
- actions.run_and_verify_svn(None, None, [], 'add', path)
- actions.run_and_verify_svn(None, None, [], 'propset',
+ actions.run_and_verify_svn(None, [], 'add', path)
+ actions.run_and_verify_svn(None, [], 'propset',
'svn:keywords', 'Revision', path)
def svn_modfile(path):
"Make text and property mods to a WC file."
path = local_path(path)
main.file_append(path, "An extra line.\n")
- actions.run_and_verify_svn(None, None, [], 'propset',
+ actions.run_and_verify_svn(None, [], 'propset',
'newprop', 'v', path)
def svn_copy(s_rev, path1, path2):
"Copy a WC path locally."
path1 = local_path(path1)
path2 = local_path(path2)
- actions.run_and_verify_svn(None, None, [], 'copy', '--parents',
+ actions.run_and_verify_svn(None, [], 'copy', '--parents',
'-r', s_rev, path1, path2)
def svn_merge(rev_range, source, target, lines=None, elides=[],
@@ -462,7 +462,7 @@ def svn_merge(rev_range, source, target,
text_resolved=text_resolved,
prop_resolved=prop_resolved,
tree_resolved=tree_resolved)
- actions.run_and_verify_svn(None, exp_out, [],
+ actions.run_and_verify_svn(exp_out, [],
'merge', rev_arg, source, target, *args)
#----------------------------------------------------------------------
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/objects.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/objects.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/objects.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/objects.py Wed Feb 11 13:29:26 2015
@@ -156,7 +156,7 @@ class SvnRepository:
"""Run 'svnadmin dump' on the repository."""
exit_code, stdout, stderr = \
- actions.run_and_verify_svnadmin(None, None, None,
+ actions.run_and_verify_svnadmin(None, None,
'dump', self.repo_absdir)
ldumpfile = local_path(output_dir + "/svnadmin.dump")
main.file_write(ldumpfile, ''.join(stderr))
@@ -167,7 +167,7 @@ class SvnRepository:
make, and each directory is a path relative to the repository root,
neither starting nor ending with a slash."""
urls = [self.repo_url + '/' + dir for dir in dirs]
- actions.run_and_verify_svn(None, None, [],
+ actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'svn_mkdirs()', '--parents',
*urls)
self.head_rev += 1
@@ -207,7 +207,7 @@ class SvnWC:
def svn_mkdir(self, rpath):
lpath = local_path(rpath)
- actions.run_and_verify_svn(None, None, [], 'mkdir', lpath)
+ actions.run_and_verify_svn(None, [], 'mkdir', lpath)
self.state.add({
rpath : wc.StateItem(status='A ')
@@ -216,7 +216,7 @@ class SvnWC:
# def propset(self, pname, pvalue, *rpaths):
# "Set property 'pname' to value 'pvalue' on each path in 'rpaths'"
# local_paths = tuple([local_path(rpath) for rpath in rpaths])
-# actions.run_and_verify_svn(None, None, [], 'propset', pname, pvalue,
+# actions.run_and_verify_svn(None, [], 'propset', pname, pvalue,
# *local_paths)
def svn_set_props(self, rpath, props):
@@ -224,10 +224,10 @@ class SvnWC:
"""
lpath = local_path(rpath)
#for prop in path's existing props:
- # actions.run_and_verify_svn(None, None, [], 'propdel',
+ # actions.run_and_verify_svn(None, [], 'propdel',
# prop, lpath)
for prop in props:
- actions.run_and_verify_svn(None, None, [], 'propset',
+ actions.run_and_verify_svn(None, [], 'propset',
prop, props[prop], lpath)
self.state.tweak(rpath, props=props)
@@ -240,7 +240,7 @@ class SvnWC:
content = "This is the file '" + filename + "'.\n" + \
"Last changed in '$Revision$'.\n"
main.file_write(lpath, content)
- actions.run_and_verify_svn(None, None, [], 'add', lpath)
+ actions.run_and_verify_svn(None, [], 'add', lpath)
self.state.add({
rpath : wc.StateItem(status='A ')
@@ -257,7 +257,7 @@ class SvnWC:
lpath = local_path(rpath)
if content is not None:
#main.file_append(lpath, "An extra line.\n")
- #actions.run_and_verify_svn(None, None, [], 'propset',
+ #actions.run_and_verify_svn(None, [], 'propset',
# 'newprop', 'v', lpath)
main.file_write(lpath, content)
self.state.tweak(rpath, content=content)
@@ -274,7 +274,7 @@ class SvnWC:
args = [lpath1, lpath2]
if parents:
args += ['--parents']
- actions.run_and_verify_svn(None, None, [], 'copy', *args)
+ actions.run_and_verify_svn(None, [], 'copy', *args)
self.state.add({
rpath2: self.state.desc[rpath1]
})
@@ -292,7 +292,7 @@ class SvnWC:
args += ['-r', rev]
if parents:
args += ['--parents']
- actions.run_and_verify_svn(None, None, [], 'copy', *args)
+ actions.run_and_verify_svn(None, [], 'copy', *args)
self.state.add({
rpath2: self.state.desc[rpath1]
})
@@ -303,12 +303,12 @@ class SvnWC:
args = []
if even_if_modified:
args += ['--force']
- actions.run_and_verify_svn(None, None, [], 'delete', lpath, *args)
+ actions.run_and_verify_svn(None, [], 'delete', lpath, *args)
def svn_commit(self, rpath='', log=''):
"Commit a WC path (recursively). Return the new revision number."
lpath = local_path(rpath)
- actions.run_and_verify_svn(None, verify.AnyOutput, [],
+ actions.run_and_verify_svn(verify.AnyOutput, [],
'commit', '-m', log, lpath)
actions.run_and_verify_update(lpath, None, None, None)
self.repo.head_rev += 1
@@ -332,6 +332,6 @@ class SvnWC:
# exp_1 = "--- Merging r.* into '" + target_re + ".*':"
# exp_2 = "(A |D |[UG] | [UG]|[UG][UG]) " + target_re + ".*"
# exp_out = verify.RegexOutput(exp_1 + "|" + exp_2)
-# actions.run_and_verify_svn(None, exp_out, [],
+# actions.run_and_verify_svn(exp_out, [],
# 'merge', rev_spec, lsource, ltarget)
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/sandbox.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/sandbox.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/sandbox.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svntest/sandbox.py Wed Feb 11 13:29:26 2015
@@ -40,7 +40,7 @@ def make_mirror(sbox, source_prop_encodi
dest_sbox = sbox.clone_dependent()
dest_sbox.build(create_wc=False, empty=True)
exit_code, output, errput = svntest.main.run_svnlook("uuid", sbox.repo_dir)
- svntest.actions.run_and_verify_svnadmin2("Setting UUID", None, None, 0,
+ svntest.actions.run_and_verify_svnadmin2(None, None, 0,
'setuuid', dest_sbox.repo_dir,
output[0][:-1])
svntest.actions.enable_revprop_changes(dest_sbox.repo_dir)
@@ -70,7 +70,7 @@ def verify_mirror(repo_url, repo_dir, ex
for prop_name in ("svn:sync-from-url", "svn:sync-from-uuid",
"svn:sync-last-merged-rev"):
svntest.actions.run_and_verify_svn(
- None, None, [], "propdel", "--revprop", "-r", "0",
+ None, [], "propdel", "--revprop", "-r", "0",
prop_name, repo_url)
# Create a dump file from the mirror repository.
dumpfile_s_n = svntest.actions.run_and_verify_dump(repo_dir)
@@ -435,7 +435,7 @@ class Sandbox:
def youngest(self):
_, output, _ = svntest.actions.run_and_verify_svnlook(
- None, svntest.verify.AnyOutput, [],
+ svntest.verify.AnyOutput, [],
'youngest', self.repo_dir)
youngest = int(output[0])
return youngest
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnversion_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnversion_tests.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnversion_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/svnversion_tests.py Wed Feb 11 13:29:26 2015
@@ -50,25 +50,22 @@ def svnversion_test(sbox):
repo_url = sbox.repo_url
# Unmodified
- svntest.actions.run_and_verify_svnversion("Unmodified working copy",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1\n" ], [])
# Unmodified, whole wc switched
- svntest.actions.run_and_verify_svnversion("Unmodified switched working copy",
- wc_dir, "some/other/url",
+ svntest.actions.run_and_verify_svnversion(wc_dir, "some/other/url",
[ "1S\n" ], [])
mu_path = os.path.join(wc_dir, 'A', 'mu')
svntest.main.file_append(mu_path, 'appended mu text')
# Modified file
- svntest.actions.run_and_verify_svnversion("Modified file",
- mu_path, repo_url + '/A/mu',
+ svntest.actions.run_and_verify_svnversion(mu_path, repo_url + '/A/mu',
[ "1M\n" ], [])
# Text modified
- svntest.actions.run_and_verify_svnversion("Modified text", wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1M\n" ], [])
expected_output = wc.State(wc_dir, {'A/mu' : Item(verb='Sending')})
@@ -80,17 +77,15 @@ def svnversion_test(sbox):
raise svntest.Failure
# Unmodified, mixed
- svntest.actions.run_and_verify_svnversion("Unmodified mixed working copy",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1:2\n" ], [])
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'blue', 'azul',
os.path.join(wc_dir, 'A', 'mu'))
# Prop modified, mixed
- svntest.actions.run_and_verify_svnversion("Property modified mixed wc",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1:2M\n" ], [])
iota_path = os.path.join(wc_dir, 'iota')
@@ -113,40 +108,34 @@ def svnversion_test(sbox):
raise svntest.Failure
# Prop modified, mixed, part wc switched
- svntest.actions.run_and_verify_svnversion("Prop-mod mixed partly switched",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1:2MS\n" ], [])
# Plain (exported) directory that is a direct subdir of a versioned dir
Q_path = os.path.join(wc_dir, 'Q')
os.mkdir(Q_path)
- svntest.actions.run_and_verify_svnversion("Exported subdirectory",
- Q_path, repo_url,
+ svntest.actions.run_and_verify_svnversion(Q_path, repo_url,
[ "Unversioned directory\n" ], [])
# Plain (exported) directory that is not a direct subdir of a versioned dir
R_path = os.path.join(Q_path, 'Q')
os.mkdir(R_path)
- svntest.actions.run_and_verify_svnversion("Exported directory",
- R_path, repo_url,
+ svntest.actions.run_and_verify_svnversion(R_path, repo_url,
[ "Unversioned directory\n" ], [])
# Switched file
- svntest.actions.run_and_verify_svnversion("Switched file",
- iota_path, repo_url + '/iota',
+ svntest.actions.run_and_verify_svnversion(iota_path, repo_url + '/iota',
[ "2S\n" ], [])
# Unversioned file
kappa_path = os.path.join(wc_dir, 'kappa')
svntest.main.file_write(kappa_path, "This is the file 'kappa'.")
- svntest.actions.run_and_verify_svnversion("Unversioned file",
- kappa_path, repo_url,
+ svntest.actions.run_and_verify_svnversion(kappa_path, repo_url,
[ "Unversioned file\n" ], [])
# Nonexistent file or directory
X_path = os.path.join(wc_dir, 'Q', 'X')
- svntest.actions.run_and_verify_svnversion("Nonexistent file or directory",
- X_path, repo_url,
+ svntest.actions.run_and_verify_svnversion(X_path, repo_url,
None, [ "'%s' doesn't exist\n"
% os.path.abspath(X_path) ])
@@ -167,7 +156,7 @@ def svnversion_test(sbox):
"--depth=files")
# Partial (sparse) checkout
- svntest.actions.run_and_verify_svnversion("Sparse checkout", A_A_path,
+ svntest.actions.run_and_verify_svnversion(A_A_path,
repo_url, [ "2SP\n" ], [])
@@ -188,7 +177,7 @@ ext-file -r 1 %s/A/D/H/omega
""" % (repo_url, repo_url)
(fd, tmp_f) = tempfile.mkstemp(dir=wc_dir)
svntest.main.file_append(tmp_f, externals_desc)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'pset',
'-F', tmp_f, 'svn:externals', C_path)
os.close(fd)
@@ -204,7 +193,7 @@ ext-file -r 1 %s/A/D/H/omega
None, wc_dir)
# Update to get it on disk
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
ext_dir_path = os.path.join(C_path, 'ext-dir')
ext_file_path = os.path.join(C_path, 'ext-file')
expected_infos = [
@@ -213,8 +202,7 @@ ext-file -r 1 %s/A/D/H/omega
]
svntest.actions.run_and_verify_info(expected_infos, ext_dir_path, ext_file_path)
- svntest.actions.run_and_verify_svnversion("working copy with svn:externals",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "2\n" ], [])
#----------------------------------------------------------------------
@@ -231,24 +219,21 @@ def svnversion_with_excluded_subtrees(sb
D_path = os.path.join(wc_dir, "A", "D")
psi_path = os.path.join(wc_dir, "A", "D", "H", "psi")
- svntest.actions.run_and_verify_svnversion("working copy with excluded dir",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1\n" ], [])
# Exclude a directory and check that svnversion detects it.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', '--set-depth', 'exclude', B_path)
- svntest.actions.run_and_verify_svnversion("working copy with excluded dir",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1P\n" ], [])
# Exclude a file and check that svnversion detects it. Target the
# svnversion command on a subtree that does not contain the excluded
# directory to assure we a detecting the switched file.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'up', '--set-depth', 'exclude', psi_path)
- svntest.actions.run_and_verify_svnversion("working copy with excluded file",
- D_path, repo_url + '/A/D',
+ svntest.actions.run_and_verify_svnversion(D_path, repo_url + '/A/D',
[ "1P\n" ], [])
def svnversion_with_structural_changes(sbox):
@@ -261,22 +246,20 @@ def svnversion_with_structural_changes(s
iota_path = os.path.join(wc_dir, 'iota')
iota_copy_path = os.path.join(wc_dir, 'iota_copy')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', iota_path, iota_copy_path)
- svntest.actions.run_and_verify_svnversion("Copied file",
- iota_copy_path, repo_url +
+ svntest.actions.run_and_verify_svnversion(iota_copy_path, repo_url +
'/iota_copy',
[ "Uncommitted local addition, "
"copy or move\n" ],
[])
C_path = os.path.join(wc_dir, 'A', 'C')
C_copy_path = os.path.join(wc_dir, 'C_copy')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', C_path, C_copy_path)
- svntest.actions.run_and_verify_svnversion("Copied dir",
- C_copy_path, repo_url +
+ svntest.actions.run_and_verify_svnversion(C_copy_path, repo_url +
'/C_copy',
[ "Uncommitted local addition, "
"copy or move\n" ],
@@ -285,13 +268,12 @@ def svnversion_with_structural_changes(s
# Test deletion
sbox.simple_rm('iota')
- svntest.actions.run_and_verify_svnversion("Deleted file",
- sbox.ospath('iota'),
+ svntest.actions.run_and_verify_svnversion(sbox.ospath('iota'),
repo_url + '/iota',
["1M\n"],
[],
)
- svntest.actions.run_and_verify_svnversion("Deleted file", wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1:2M\n" ], [])
def committed_revisions(sbox):
@@ -303,7 +285,7 @@ def committed_revisions(sbox):
sbox.simple_copy('iota', 'iota2')
sbox.simple_commit()
sbox.simple_update()
- svntest.actions.run_and_verify_svnversion("Committed revisions", wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1:2\n" ], [],
"--committed")
@@ -313,8 +295,7 @@ def non_reposroot_wc(sbox):
wc_dir = sbox.add_wc_path('wc2')
repo_url = sbox.repo_url + "/A/B"
svntest.main.run_svn(None, 'checkout', repo_url, wc_dir)
- svntest.actions.run_and_verify_svnversion("Non-repos-root wc dir",
- wc_dir, repo_url,
+ svntest.actions.run_and_verify_svnversion(wc_dir, repo_url,
[ "1\n" ], [])
@Issue(3858)
@@ -332,25 +313,24 @@ def child_switched(sbox):
### Target is repos root and WC root.
# No switches.
- svntest.actions.run_and_verify_svnversion(None, wc_dir, None,
+ svntest.actions.run_and_verify_svnversion(wc_dir, None,
[ "2\n" ], [])
# Switch A/B to a sibling.
sbox.simple_switch(repo_url + '/A/D', 'A/B')
# This should detect the switch at A/B.
- svntest.actions.run_and_verify_svnversion(None, wc_dir, None,
+ svntest.actions.run_and_verify_svnversion(wc_dir, None,
[ "2S\n" ], [])
### Target is neither repos root nor WC root.
# But A/B/G and its children are not switched by itself.
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'A/B/G'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A/B/G'),
None, [ "2\n" ], [])
# And A/B isn't switched when you look at it directly.
- svntest.actions.run_and_verify_svnversion(None, os.path.join(wc_dir, 'A/B'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A/B'),
None, [ "2\n" ], [])
# Switch branch/D to ^/A, then switch branch/D/G back to ^/branch/D/G so
@@ -359,37 +339,31 @@ def child_switched(sbox):
sbox.simple_switch(repo_url + '/branch/D/G', 'branch/D/G')
# This should detect the switch at branch/D and branch/D/G.
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'branch'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'branch'),
None, [ "2S\n" ], [])
# Directly targeting the switched branch/D should still detect the switch
# at branch/D/G even though the latter isn't switched against the root of
# the working copy.
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'branch',
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'branch',
'D'),
None, [ "2S\n" ], [])
# Switch A/B to ^/.
sbox.simple_switch(repo_url, 'A/B')
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir),
None, [ "2S\n" ], [])
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'A'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A'),
None, [ "2S\n" ], [])
### Target is repos root but not WC root.
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'A', 'B'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A', 'B'),
None, [ "2\n" ], [])
# Switch A/B/A/D/G to ^/A/D/H.
sbox.simple_switch(repo_url + '/A/D/H', 'A/B/A/D/G')
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'A', 'B'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'A', 'B'),
None, [ "2S\n" ], [])
### Target is not repos root but is WC root.
@@ -398,17 +372,14 @@ def child_switched(sbox):
# ^A/D/G.
sbox.simple_switch(repo_url + '/branch', '.')
sbox.simple_switch(repo_url + '/A/D/G', 'D/G')
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir,),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir,),
None, [ "2S\n" ], [])
### Target is neither repos root nor WC root.
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'D'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'D'),
None, [ "2S\n" ], [])
- svntest.actions.run_and_verify_svnversion(None,
- os.path.join(wc_dir, 'D', 'H'),
+ svntest.actions.run_and_verify_svnversion(os.path.join(wc_dir, 'D', 'H'),
None, [ "2\n" ], [])
########################################################################
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/switch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/switch_tests.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/switch_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/switch_tests.py Wed Feb 11 13:29:26 2015
@@ -351,13 +351,11 @@ def delete_subdir(sbox):
A2_url = sbox.repo_url + '/A2'
A2_B_F_url = sbox.repo_url + '/A2/B/F'
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 3.\n'], [],
'rm', '-m', 'delete subdir', A2_B_F_url)
@@ -392,7 +390,7 @@ def file_dir_file(sbox):
file_url = sbox.repo_url + '/iota'
dir_url = sbox.repo_url + '/A/C'
- svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+ svntest.actions.run_and_verify_svn(None, [], 'switch',
'--ignore-ancestry', dir_url, file_path)
if not os.path.isdir(file_path):
raise svntest.Failure
@@ -402,7 +400,7 @@ def file_dir_file(sbox):
# In this specific case the switch editor is designed to be rooted on the node
# itself instead of its ancestor. If you would use sbox.ospath('A') for
# file_path the switch works both ways.
- svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+ svntest.actions.run_and_verify_svn(None, [], 'switch',
'--ignore-ancestry', file_url, file_path)
if not os.path.isfile(file_path):
raise svntest.Failure
@@ -447,7 +445,7 @@ def nonrecursive_switching(sbox):
sbox.simple_commit()
# Try to switch "wc2" to the branch (non-recursively)
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '-N',
+ svntest.actions.run_and_verify_svn(None, [], 'switch', '-N',
'--ignore-ancestry', version1_url, wc2_dir)
# Check the URLs of the (not switched) directories.
@@ -483,8 +481,7 @@ def failed_anchor_is_target(sbox):
# Make a directory 'G/psi' in the repository.
G_url = sbox.repo_url + '/A/D/G'
G_psi_url = G_url + '/psi'
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'], [],
'mkdir', '-m', 'log msg', G_psi_url)
@@ -494,7 +491,7 @@ def failed_anchor_is_target(sbox):
svntest.main.file_append(psi_path, "more text")
# This switch raises a tree conflict on 'psi', because of the local mods.
- svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
'switch', '--ignore-ancestry',
G_url, H_path)
@@ -545,8 +542,7 @@ def bad_intermediate_urls(sbox):
# First, make an extra subdirectory in C to match one in the root, plus
# another one inside of that.
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'], [],
'mkdir', '-m', 'log msg',
url_A_C_A, url_A_C_A_Z)
@@ -651,13 +647,13 @@ def obstructed_switch(sbox):
'Committed revision 2.\n',
]
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'cp', '-m',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'cp', '-m',
'msgcopy', url_A_B_E, url_A_B_Esave)
# svn rm A/B/E/alpha
expected_stdout = ['D ' + A_B_E_alpha + '\n']
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'rm',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'rm',
A_B_E_alpha)
# svn commit
@@ -706,7 +702,7 @@ def obstructed_switch(sbox):
expected_stdout = verify.RegexOutput(
".*local file unversioned, incoming file add upon switch",
match_all=False)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'info',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'info',
A_B_E_alpha)
@@ -751,7 +747,7 @@ def commit_mods_below_switch(sbox):
False, '--ignore-ancestry')
D_path = sbox.ospath('A/D')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'x', 'x', C_path, D_path)
expected_status.tweak('A/C', 'A/D', status=' M')
@@ -786,8 +782,7 @@ def refresh_read_only_attribute(sbox):
# Create a branch.
url = sbox.repo_url + '/A'
branch_url = sbox.repo_url + '/A-branch'
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'], [],
'cp', '-m', 'svn:needs-lock not set',
url, branch_url)
@@ -795,7 +790,7 @@ def refresh_read_only_attribute(sbox):
# Set the svn:needs-lock property on a file from the "trunk".
A_path = sbox.ospath('A')
mu_path = os.path.join(A_path, 'mu')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ps', 'svn:needs-lock', '1', mu_path)
# Commit the propset of svn:needs-lock.
@@ -857,7 +852,7 @@ def switch_change_repos_root(sbox):
# Test 1: A switch that changes to a non-existing repo shouldn't work.
expected_err = ".*Unable to open repository.*|.*Could not open.*|"\
".*Could not find.*|.*No repository found.*"
- svntest.actions.run_and_verify_svn(None, None,
+ svntest.actions.run_and_verify_svn(None,
expected_err,
'switch', '--ignore-ancestry',
other_A_url, A_wc_dir)
@@ -867,7 +862,7 @@ def switch_change_repos_root(sbox):
other_A_url = other_repo_url + "/A"
svntest.main.create_repos(other_repo_dir)
- svntest.actions.run_and_verify_svn(None, None,
+ svntest.actions.run_and_verify_svn(None,
".*UUID.*",
'switch', '--ignore-ancestry',
other_A_url, A_wc_dir)
@@ -1102,7 +1097,7 @@ def forced_switch_failures(sbox):
'Tree conflict: local dir unversioned, incoming file add upon switch\n',
match_all=False)
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'info',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'info',
A_B_F_pi)
@@ -1115,7 +1110,7 @@ def forced_switch_failures(sbox):
'Committed revision 2.\n',
])
- actions.run_and_verify_svn2('OUTPUT', expected_stdout, [], 0, 'mkdir',
+ actions.run_and_verify_svn2(expected_stdout, [], 0, 'mkdir',
'-m', 'Log message', url_A_D_H_I)
# Make A/D/G/I and co A/D/H/I into it.
@@ -1130,7 +1125,6 @@ def forced_switch_failures(sbox):
})
exit_code, so, se = svntest.actions.run_and_verify_svn(
- "Unexpected error during co",
['Checked out revision 2.\n'], [],
"co", url_A_D_H_I, A_D_G_I)
@@ -1242,7 +1236,7 @@ def switch_with_obstructing_local_adds(s
"This is the unversioned file 'upsilon'.\n")
# Add the above obstructions.
- svntest.actions.run_and_verify_svn("Add error:", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'add', G_path, I_path,
gamma_copy_path)
@@ -1316,15 +1310,15 @@ def switch_scheduled_add(sbox):
nodo_path = sbox.ospath('nodo')
svntest.main.file_append(file_path, "")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'add', file_path)
- svntest.actions.run_and_verify_svn(None, None,
+ svntest.actions.run_and_verify_svn(None,
"svn: E200007: Cannot switch '.*file' " +
"because it is not in the repository yet",
'switch', '--ignore-ancestry',
switch_url, file_path)
- svntest.actions.run_and_verify_svn(None, None,
+ svntest.actions.run_and_verify_svn(None,
"svn: E155010: The node '.*nodo' was not",
'switch', '--ignore-ancestry',
switch_url, nodo_path)
@@ -1360,7 +1354,7 @@ def mergeinfo_switch_elision(sbox):
"Checked out revision 1.\n",
"A " + B_COPY_1_path + "\n",
])
- svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
+ svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy',
sbox.repo_url + "/A/B", B_COPY_1_path)
expected_stdout = verify.UnorderedOutput([
@@ -1372,7 +1366,7 @@ def mergeinfo_switch_elision(sbox):
"Checked out revision 1.\n",
"A " + B_COPY_2_path + "\n",
])
- svntest.actions.run_and_verify_svn(None, expected_stdout, [], 'copy',
+ svntest.actions.run_and_verify_svn(expected_stdout, [], 'copy',
sbox.repo_url + "/A/B", B_COPY_2_path)
expected_output = svntest.wc.State(wc_dir, {
@@ -1580,8 +1574,7 @@ def mergeinfo_switch_elision(sbox):
None, None, None, None, None, True,
'--ignore-ancestry')
- svntest.actions.run_and_verify_svn(None,
- ["property '" + SVN_PROP_MERGEINFO +
+ svntest.actions.run_and_verify_svn(["property '" + SVN_PROP_MERGEINFO +
"' set on '" + lambda_path + "'" +
"\n"], [], 'ps', SVN_PROP_MERGEINFO,
'/A/B/lambda:3-4', lambda_path)
@@ -2043,8 +2036,7 @@ def tolerate_local_mods(sbox):
A_url = sbox.repo_url + '/A'
A2_url = sbox.repo_url + '/A2'
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'], [],
'cp', '-m', 'make copy', A_url, A2_url)
@@ -2582,7 +2574,7 @@ def copy_with_switched_subdir(sbox):
svntest.actions.run_and_verify_status(wc_dir, state)
# Switch A/D/G
- svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+ svntest.actions.run_and_verify_svn(None, [], 'switch',
'--ignore-ancestry', E_url, G)
state.tweak('A/D/G', switched='S')
@@ -2594,7 +2586,7 @@ def copy_with_switched_subdir(sbox):
svntest.actions.run_and_verify_status(wc_dir, state)
# And now copy A/D and everything below it to R
- svntest.actions.run_and_verify_svn(None, None, [], 'cp', D, R)
+ svntest.actions.run_and_verify_svn(None, [], 'cp', D, R)
state.add({
'R' : Item(status='A ', copied='+', wc_rev='-'),
@@ -2619,13 +2611,12 @@ def copy_with_switched_subdir(sbox):
# Checkout working copy to verify result
svntest.main.safe_rmtree(wc_dir, 1)
- svntest.actions.run_and_verify_svn(None,
- None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'checkout',
sbox.repo_url, wc_dir)
# Switch A/D/G again to recreate state
- svntest.actions.run_and_verify_svn(None, None, [], 'switch',
+ svntest.actions.run_and_verify_svn(None, [], 'switch',
'--ignore-ancestry', E_url, G)
# Clear the statuses
@@ -2649,15 +2640,15 @@ def up_to_old_rev_with_subtree_switched_
# Starting with a vanilla greek tree, create a branch of A, switch
# that branch to the root of the repository, then update the WC to
# r1.
- svntest.actions.run_and_verify_svn(None, None, [], 'copy', A_path,
+ svntest.actions.run_and_verify_svn(None, [], 'copy', A_path,
branch_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'ci', wc_dir,
+ svntest.actions.run_and_verify_svn(None, [], 'ci', wc_dir,
'-m', 'Create a branch')
- svntest.actions.run_and_verify_svn(None, None, [], 'sw', sbox.repo_url,
+ svntest.actions.run_and_verify_svn(None, [], 'sw', sbox.repo_url,
branch_path, '--ignore-ancestry')
# Now update the WC to r1.
- svntest.actions.run_and_verify_svn(None, None, [], 'up', '-r1', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', '-r1', wc_dir)
def different_node_kind(sbox):
"switch to a different node kind"
@@ -2682,7 +2673,7 @@ def different_node_kind(sbox):
None, expected_disk, expected_status,
None, None, None, None, None, False,
'--ignore-ancestry')
- svntest.actions.run_and_verify_svn(None, None, [], 'info', full_path)
+ svntest.actions.run_and_verify_svn(None, [], 'info', full_path)
if not os.path.isdir(full_path):
raise svntest.Failure
@@ -2698,7 +2689,7 @@ def different_node_kind(sbox):
None, expected_disk, expected_status,
None, None, None, None, None, False,
'--ignore-ancestry')
- svntest.actions.run_and_verify_svn(None, None, [], 'info', full_path)
+ svntest.actions.run_and_verify_svn(None, [], 'info', full_path)
if not os.path.isfile(full_path):
raise svntest.Failure
@@ -2718,12 +2709,12 @@ def switch_to_spaces(sbox):
repo_url = sbox.repo_url
# Paths are normalized in the command processing, so %20 is equivalent to ' '
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', repo_url + '/A',
repo_url + '/A%20with space',
'-m', '')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mv', repo_url + '/A%20with space',
repo_url + '/A with%20more spaces',
'-m', '')
@@ -2871,7 +2862,7 @@ def switch_moves(sbox):
branch_url = sbox.repo_url + '/branch'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', sbox.wc_dir, branch_url,
'-m', '')
Modified: subversion/branches/reuse-ra-session/subversion/tests/cmdline/trans_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/reuse-ra-session/subversion/tests/cmdline/trans_tests.py?rev=1658954&r1=1658953&r2=1658954&view=diff
==============================================================================
--- subversion/branches/reuse-ra-session/subversion/tests/cmdline/trans_tests.py (original)
+++ subversion/branches/reuse-ra-session/subversion/tests/cmdline/trans_tests.py Wed Feb 11 13:29:26 2015
@@ -191,7 +191,7 @@ def setup_working_copy(wc_dir, value_len
# Set the property keyword for PATH. Turn on all possible keywords.
### todo: Later, take list of keywords to set.
def keywords_on(path):
- svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+ svntest.actions.run_and_verify_svn(None, [], 'propset',
"svn:keywords",
"Author Rev Date URL Id Header",
path)
@@ -199,7 +199,7 @@ def keywords_on(path):
# Delete property NAME from versioned PATH in the working copy.
### todo: Later, take list of keywords to remove from the propval?
def keywords_off(path):
- svntest.actions.run_and_verify_svn(None, None, [], 'propdel',
+ svntest.actions.run_and_verify_svn(None, [], 'propdel',
"svn:keywords", path)
@@ -462,7 +462,7 @@ def update_modified_with_translation(sbo
# Replace contents of rho and set eol translation to 'native'
rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
svntest.main.file_write(rho_path, "1\n2\n3\n4\n5\n6\n7\n8\n9\n")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'svn:eol-style', 'native',
rho_path)
@@ -570,16 +570,16 @@ def eol_change_is_text_mod(sbox):
f.close()
# commit the file
- svntest.actions.run_and_verify_svn(None, None, [], 'add', foo_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [], 'add', foo_path)
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg',
foo_path)
if svntest.main.windows:
- svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+ svntest.actions.run_and_verify_svn(None, [], 'propset',
'svn:eol-style', 'LF', foo_path)
else:
- svntest.actions.run_and_verify_svn(None, None, [], 'propset',
+ svntest.actions.run_and_verify_svn(None, [], 'propset',
'svn:eol-style', 'CRLF', foo_path)
# check 1: did new contents get transmitted?
@@ -587,7 +587,7 @@ def eol_change_is_text_mod(sbox):
"Transmitting file data .done\n",
"Committing transaction...\n",
"Committed revision 3.\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'ci', '-m', 'log msg', foo_path)
# check 2: do the files have the right contents now?
@@ -617,20 +617,20 @@ def keyword_expanded_on_checkout(sbox):
# The bug didn't occur if there were multiple files in the
# directory, so setup an empty directory.
Z_path = os.path.join(wc_dir, 'Z')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', Z_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', Z_path)
# Add the file that has the keyword to be expanded
url_path = os.path.join(Z_path, 'url')
svntest.main.file_append(url_path, "$URL$")
- svntest.actions.run_and_verify_svn(None, None, [], 'add', url_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', url_path)
keywords_on(url_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'log msg', wc_dir)
other_wc_dir = sbox.add_wc_path('other')
other_url_path = os.path.join(other_wc_dir, 'Z', 'url')
- svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+ svntest.actions.run_and_verify_svn(None, [], 'checkout',
sbox.repo_url,
other_wc_dir)
@@ -657,7 +657,7 @@ def cat_keyword_expansion(sbox):
# Set up A/mu to do $Rev$ keyword expansion
svntest.main.file_append(mu_path , "$Rev$\n$Author$")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'svn:keywords', 'Rev Author',
mu_path)
@@ -674,18 +674,18 @@ def cat_keyword_expansion(sbox):
full_author = "x" * 400
key_author = "x" * 244
svntest.actions.enable_revprop_changes(sbox.repo_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', '--revprop', '-r2',
'svn:author', full_author,
sbox.wc_dir)
- svntest.actions.run_and_verify_svn(None, [ full_author ], [],
+ svntest.actions.run_and_verify_svn([ full_author ], [],
'propget', '--revprop', '-r2',
'svn:author', '--strict',
sbox.wc_dir)
# Make another commit so that the last changed revision for A/mu is
# not HEAD.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'foo', 'bar', lambda_path)
expected_output = wc.State(wc_dir, {
'A/B/lambda' : Item(verb='Sending'),
@@ -697,8 +697,7 @@ def cat_keyword_expansion(sbox):
# At one stage the keywords were expanded to values for the requested
# revision, not to those committed revision
- svntest.actions.run_and_verify_svn(None,
- [ "This is the file 'mu'.\n",
+ svntest.actions.run_and_verify_svn([ "This is the file 'mu'.\n",
"$Rev: 2 $\n",
"$Author: " + key_author + " $"], [],
'cat', '-r', 'HEAD', mu_path)
@@ -714,8 +713,8 @@ def copy_propset_commit(sbox):
mu2_path = os.path.join(wc_dir, 'A', 'mu2')
# Copy and propset
- svntest.actions.run_and_verify_svn(None, None, [], 'copy', mu_path, mu2_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [], 'copy', mu_path, mu2_path)
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'svn:eol-style', 'native',
mu2_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -757,7 +756,7 @@ def propset_commit_checkout_nocrash(sbox
None, wc_dir)
# Set property to do keyword expansion on A/mu, commit.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'svn:keywords', 'Rev', mu_path)
expected_output = wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'),
@@ -772,7 +771,7 @@ def propset_commit_checkout_nocrash(sbox
other_wc_dir = sbox.add_wc_path('other')
mu_other_path = os.path.join(other_wc_dir, 'A', 'mu')
- svntest.actions.run_and_verify_svn(None, None, [], 'checkout',
+ svntest.actions.run_and_verify_svn(None, [], 'checkout',
sbox.repo_url,
other_wc_dir)
@@ -795,14 +794,14 @@ def propset_revert_noerror(sbox):
# Set the Rev keyword for the mu file
# could use the keywords_on()/keywords_off() functions to
# set/del all svn:keywords
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'svn:keywords', 'Rev', mu_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/mu', status=' M')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Revert the propset
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', mu_path)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', mu_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -917,11 +916,11 @@ def autoprops_inconsistent_eol(sbox):
sbox.simple_add_text(text, 'add.c')
sbox.simple_add_text(text, 'add-force.c')
- svntest.actions.run_and_verify_svn(None, None, '.*inconsistent newlines.*',
+ svntest.actions.run_and_verify_svn(None, '.*inconsistent newlines.*',
'ps', 'svn:eol-style', 'native',
sbox.ospath('add.c'))
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ps', 'svn:eol-style', 'native', '--force',
sbox.ospath('add.c'))
@@ -943,7 +942,7 @@ def autoprops_inconsistent_eol(sbox):
expected_output = ['A %s\n' % sbox.ospath('auto.c')]
# Fails with svn: E200009: File '.*auto.c' has inconsistent newlines
- svntest.actions.run_and_verify_svn(None, expected_output,
+ svntest.actions.run_and_verify_svn(expected_output,
[], 'add', sbox.ospath('auto.c'))
@XFail()
@@ -962,7 +961,7 @@ def autoprops_inconsistent_mime(sbox):
expected_output = ['A %s\n' % sbox.ospath('c.iota.c')]
# Fails with svn: E200009: File '.*c.iota.c' has binary mime type property
- svntest.actions.run_and_verify_svn(None, expected_output,
+ svntest.actions.run_and_verify_svn(expected_output,
[], 'add', sbox.ospath('c.iota.c'))