Several files in the test suite use the run_and_verify_svn method
extensively, but argument usage is inconsistent. The first argument can
be either "" or None, with no functional change. Prior to applying this
patch, the usage of None far outweighs the usage of "". This patch
changes the python tests to use None instead of "" when appropriate for
run_and_verify_svn.
-Hyrum
[[[
Update the tests to consistently use None as the first argument when
calling run_and_verify_svn.
* subversion/tests/cmdline/revert_tests.py
* subversion/tests/cmdline/log_tests.py
* subversion/tests/cmdline/trans_tests.py
* subversion/tests/cmdline/externals_tests.py
* subversion/tests/cmdline/copy_tests.py
* subversion/tests/cmdline/svnversion_tests.py
* subversion/tests/cmdline/special_tests.py
* subversion/tests/cmdline/basic_tests.py
* subversion/tests/cmdline/utf8_tests.py
* subversion/tests/cmdline/commit_tests.py
* subversion/tests/cmdline/authz_tests.py
Change calls to svntest.actions.run_and_verify_svn to use None instead
of "" when not expecting a message.
]]]
Index: subversion/tests/cmdline/revert_tests.py
===================================================================
--- subversion/tests/cmdline/revert_tests.py (revision 22413)
+++ subversion/tests/cmdline/revert_tests.py (working copy)
@@ -51,11 +51,11 @@
# Set props on file which is copy-source later on
pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'phony-prop', '-F', prop_path,
pi_path)
os.remove(prop_path)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'svn:eol-style', 'LF', rho_path)
# Verify props having been set
@@ -84,7 +84,7 @@
wc_dir)
# Bring wc into sync
- svntest.actions.run_and_verify_svn("", None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
# File scheduled for deletion
svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
@@ -100,7 +100,7 @@
else:
pi_src = sbox.repo_url + '/A/D/G/pi'
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'cp', pi_src, rho_path)
# Verify both content and props have been copied
@@ -116,7 +116,7 @@
expected_status.tweak('A/D/G/rho', status=' ', copied=None, wc_rev='2')
expected_output = ["Reverted '" + rho_path + "'\n"]
- svntest.actions.run_and_verify_svn("", expected_output, [],
+ svntest.actions.run_and_verify_svn(None, expected_output, [],
'revert', '-R', wc_dir)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -486,7 +486,7 @@
# Replace file for the first time
pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'cp', pi_src, rho_path)
expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
@@ -503,13 +503,13 @@
# Replace file for the second time
pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
- svntest.actions.run_and_verify_svn("", None, [], 'cp', pi_src, rho_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'cp', pi_src, rho_path)
expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Now revert
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'revert', '-R', wc_dir)
# Check disk status
Index: subversion/tests/cmdline/log_tests.py
===================================================================
--- subversion/tests/cmdline/log_tests.py (revision 22413)
+++ subversion/tests/cmdline/log_tests.py (working copy)
@@ -419,21 +419,21 @@
svntest.main.file_append(iota_path, "2")
# try to check in a change using a versioned file as your log entry.
- svntest.actions.run_and_verify_svn("", None, SVNAnyOutput,
+ svntest.actions.run_and_verify_svn(None, None, SVNAnyOutput,
'ci', '-F', log_path)
# force it. should not produce any errors.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ci', '-F', log_path, '--force-log')
svntest.main.file_append(mu_path, "2")
# try the same thing, but specifying the file to commit explicitly.
- svntest.actions.run_and_verify_svn("", None, SVNAnyOutput,
+ svntest.actions.run_and_verify_svn(None, None, SVNAnyOutput,
'ci', '-F', log_path, mu_path)
# force it... should succeed.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ci',
'-F', log_path,
'--force-log', mu_path)
@@ -450,7 +450,7 @@
svntest.main.safe_rmtree(sbox.repo_dir, 1)
svntest.main.create_repos(sbox.repo_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'log',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -691,7 +691,8 @@
None, 1, dump_str)
# run log
- output, errput = svntest.actions.run_and_verify_svn("", None, [], 'log', URL)
+ output, errput = svntest.actions.run_and_verify_svn(None, None, [], 'log',
+ URL)
# Verify the output contains either the expected fuzzy escape
# sequence, or the literal control char.
@@ -720,7 +721,7 @@
date_re = re.compile('<date');
# Ensure that we get a date before we delete the property.
- output, errput = svntest.actions.run_and_verify_svn("", None, [],
+ output, errput = svntest.actions.run_and_verify_svn(None, None, [],
'log', '--xml', '-r1',
sbox.wc_dir)
matched = 0
@@ -731,11 +732,11 @@
raise svntest.Failure("log contains no date element")
# Set the svn:date revprop to the empty string on revision 1.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'pdel', '--revprop', '-r1', 'svn:date',
sbox.wc_dir)
- output, errput = svntest.actions.run_and_verify_svn("", None, [],
+ output, errput = svntest.actions.run_and_verify_svn(None, None, [],
'log', '--xml', '-r1',
sbox.wc_dir)
for line in output:
Index: subversion/tests/cmdline/trans_tests.py
===================================================================
--- subversion/tests/cmdline/trans_tests.py (revision 22413)
+++ subversion/tests/cmdline/trans_tests.py (working copy)
@@ -623,11 +623,11 @@
full_author = "x" * 400
key_author = "x" * 244
svntest.actions.enable_revprop_changes(sbox.repo_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'propset', '--revprop', '-r2',
'svn:author', full_author,
sbox.wc_dir)
- svntest.actions.run_and_verify_svn("", [ full_author ], [],
+ svntest.actions.run_and_verify_svn(None, [ full_author ], [],
'propget', '--revprop', '-r2',
'svn:author', '--strict',
sbox.wc_dir)
Index: subversion/tests/cmdline/externals_tests.py
===================================================================
--- subversion/tests/cmdline/externals_tests.py (revision 22413)
+++ subversion/tests/cmdline/externals_tests.py (working copy)
@@ -90,7 +90,7 @@
D_path = os.path.join(wc_init_dir, "A/D")
# Create a working copy.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -100,27 +100,27 @@
# post-commit status checks.
svntest.main.file_append(mu_path, "Added to mu in revision 2.\n")
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
svntest.main.file_append(pi_path, "Added to pi in revision 3.\n")
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
svntest.main.file_append(lambda_path, "Added to lambda in revision 4.\n")
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
svntest.main.file_append(omega_path, "Added to omega in revision 5.\n")
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ci', '-m', 'log msg',
'--quiet', wc_init_dir)
# Get the whole working copy to revision 5.
- svntest.actions.run_and_verify_svn("", None, [], 'up', wc_init_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_init_dir)
# Now copy the initial repository to create the "other" repository,
# the one to which the first repository's `svn:externals' properties
@@ -135,7 +135,7 @@
tmp_f = os.tempnam(wc_init_dir, 'tmp')
svntest.main.file_append(tmp_f, externals_desc)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'pset',
'-F', tmp_f, 'svn:externals', C_path)
@@ -152,7 +152,7 @@
"\n"
svntest.main.file_append(tmp_f, externals_desc)
- svntest.actions.run_and_verify_svn("", None, [], 'pset',
+ svntest.actions.run_and_verify_svn(None, None, [], 'pset',
'-F', tmp_f, 'svn:externals', D_path)
os.remove(tmp_f)
@@ -179,9 +179,9 @@
and commit the change."""
tmp_f = os.tempnam(svntest.main.temp_dir, 'tmp')
svntest.main.file_append(tmp_f, new_val)
- svntest.actions.run_and_verify_svn("", None, [], 'pset',
+ svntest.actions.run_and_verify_svn(None, None, [], 'pset',
'-F', tmp_f, 'svn:externals', path)
- svntest.actions.run_and_verify_svn("", None, [], 'ci',
+ svntest.actions.run_and_verify_svn(None, None, [], 'ci',
'-m', 'log msg', '--quiet', path)
os.remove(tmp_f)
@@ -210,7 +210,7 @@
repo_url = sbox.repo_url
# Create a working copy.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -270,13 +270,13 @@
other_repo_url = repo_url + ".other"
# Checkout two working copies.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
repo_url, wc_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -300,7 +300,7 @@
change_external(os.path.join(wc_dir, "A/D"), new_externals_desc)
# Update the other working copy, see if we get the new item.
- svntest.actions.run_and_verify_svn("", None, [], 'up', other_wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', other_wc_dir)
exdir_E_path = os.path.join(other_wc_dir, "A", "D", "exdir_E")
if (not os.path.exists(exdir_E_path)):
@@ -320,13 +320,13 @@
other_repo_url = repo_url + ".other"
# Checkout two working copies.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
repo_url, wc_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -360,7 +360,7 @@
change_external(os.path.join(wc_dir, "A/D"), new_externals_desc)
# Update other working copy, see if lose & preserve things appropriately
- svntest.actions.run_and_verify_svn("", None, [], 'up', other_wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', other_wc_dir)
exdir_A_path = os.path.join(other_wc_dir, "A", "D", "exdir_A")
if (not os.path.exists(exdir_A_path)):
@@ -404,13 +404,13 @@
other_repo_url = repo_url + ".other"
# Checkout two working copies.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
repo_url, wc_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -433,7 +433,7 @@
change_external(os.path.join(wc_dir, "A/D"), new_externals_desc)
# Update other working copy, see if get the right change.
- svntest.actions.run_and_verify_svn("", None, [], 'up', other_wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', other_wc_dir)
xyzb_path = os.path.join(other_wc_dir, "x", "y", "z", "blah")
@@ -457,13 +457,13 @@
other_repo_url = repo_url + ".other"
# Checkout two working copies.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
repo_url, wc_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -494,7 +494,7 @@
change_external(os.path.join(wc_dir, "A/D"), new_externals_desc)
# Update other working copy, see if get the right change.
- svntest.actions.run_and_verify_svn("", None, [], 'up', other_wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', other_wc_dir)
xyzb_path = os.path.join(other_wc_dir, "x", "y", "z", "blah")
@@ -518,13 +518,13 @@
other_repo_url = repo_url + ".other"
# Checkout two working copies.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
repo_url, wc_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -553,7 +553,7 @@
# The output's going to be all screwy because of the module
# notifications, so don't bother parsing it, just run update
# directly.
- svntest.actions.run_and_verify_svn("", None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
external_gamma_path = os.path.join(wc_dir, 'A', 'D', 'exdir_A', 'D', 'gamma')
fp = open(external_gamma_path, 'r')
@@ -581,7 +581,7 @@
None, None, None, None, None,
other_wc_dir)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'up', os.path.join(wc_dir, "A", "C"))
external_rho_path = os.path.join(wc_dir, 'A', 'C', 'exdir_G', 'rho')
@@ -607,7 +607,7 @@
other_repo_url = repo_url + ".other"
# Checkout a working copy
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'checkout',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -622,7 +622,7 @@
tmp_f = os.tempnam()
svntest.main.file_append(tmp_f, externals_desc)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'pset', '-F', tmp_f,
'svn:externals', B_path)
os.remove(tmp_f)
@@ -655,7 +655,7 @@
def set_externals_for_path_expect_error(path, val, dir):
tmp_f = os.tempnam(dir, 'tmp')
svntest.main.file_append(tmp_f, val)
- svntest.actions.run_and_verify_svn("", None, SVNAnyOutput,
+ svntest.actions.run_and_verify_svn(None, None, SVNAnyOutput,
'pset', '-F', tmp_f,
'svn:externals', path)
os.remove(tmp_f)
@@ -697,7 +697,7 @@
repo_url = sbox.repo_url
# Create a working copy.
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'export',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
Index: subversion/tests/cmdline/copy_tests.py
===================================================================
--- subversion/tests/cmdline/copy_tests.py (revision 22413)
+++ subversion/tests/cmdline/copy_tests.py (working copy)
@@ -72,7 +72,7 @@
else:
pi_src = sbox.repo_url + '/A/D/G/pi'
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'cp', pi_src, rho_path)
# Now commit
@@ -109,11 +109,11 @@
# Set props on file which is copy-source later on
pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'phony-prop', '-F',
prop_path, pi_path)
os.remove(prop_path)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'ps', 'svn:eol-style', 'LF', rho_path)
# Verify props having been set
@@ -141,7 +141,7 @@
wc_dir)
# Bring wc into sync
- svntest.actions.run_and_verify_svn("", None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
# File scheduled for deletion
svntest.actions.run_and_verify_svn(None, None, [], 'rm', rho_path)
@@ -157,7 +157,7 @@
else:
pi_src = sbox.repo_url + '/A/D/G/pi'
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'cp', pi_src, rho_path)
# Verify both content and props have been copied
@@ -592,9 +592,9 @@
# These copies should fail
pi_path = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
rho_path = os.path.join(wc_dir, 'A', 'D', 'G', 'rho')
- svntest.actions.run_and_verify_svn("", None, SVNAnyOutput,
+ svntest.actions.run_and_verify_svn(None, None, SVNAnyOutput,
'cp', pi_path, rho_path)
- svntest.actions.run_and_verify_svn("", None, SVNAnyOutput,
+ svntest.actions.run_and_verify_svn(None, None, SVNAnyOutput,
'cp', pi_path, tau_path)
# Status after failed copies should not have changed
@@ -983,7 +983,7 @@
pi_url = other_repo_url + "/A/D/G/pi"
# Expect an error in the directory case
- svntest.actions.run_and_verify_svn("", None, SVNAnyOutput,
+ svntest.actions.run_and_verify_svn(None, None, SVNAnyOutput,
'copy', E_url, wc_dir)
# But file case should work fine.
@@ -1802,7 +1802,7 @@
# Copy 'pi' over 'rho' with history.
pi_src = os.path.join(wc_dir, 'A', 'D', 'G', 'pi')
- svntest.actions.run_and_verify_svn("", None, [], 'cp', pi_src, rho_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'cp', pi_src, rho_path)
# Check that file copied.
expected_status.tweak('A/D/G/rho', status='R ', copied='+', wc_rev='-')
Index: subversion/tests/cmdline/svnversion_tests.py
===================================================================
--- subversion/tests/cmdline/svnversion_tests.py (revision 22413)
+++ subversion/tests/cmdline/svnversion_tests.py (working copy)
@@ -133,7 +133,7 @@
externals_desc = "ext -r 1 " + repo_url + "/A/D/G" + "\n"
tmp_f = os.tempnam(wc_dir, 'tmp')
svntest.main.file_append(tmp_f, externals_desc)
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'pset',
'-F', tmp_f, 'svn:externals', C_path)
os.remove(tmp_f)
Index: subversion/tests/cmdline/special_tests.py
===================================================================
--- subversion/tests/cmdline/special_tests.py (revision 22413)
+++ subversion/tests/cmdline/special_tests.py (working copy)
@@ -332,7 +332,7 @@
None, None, None, None, wc_dir)
# Now remove it
- svntest.actions.run_and_verify_svn("", None, [], 'rm', newfile_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'rm', newfile_path)
# Commit and verify that it worked
expected_output = svntest.wc.State(wc_dir, {
Index: subversion/tests/cmdline/basic_tests.py
===================================================================
--- subversion/tests/cmdline/basic_tests.py (revision 22413)
+++ subversion/tests/cmdline/basic_tests.py (working copy)
@@ -740,7 +740,7 @@
### Most of the rest of this test is ineffective, due to the
### problems described in issue #1611.
- svntest.actions.run_and_verify_svn("", None, [], 'rm', E_path)
+ svntest.actions.run_and_verify_svn(None, None, [], 'rm', E_path)
svntest.main.safe_rmtree(E_path)
expected_status.tweak('A/B/E', status='D ')
expected_status.tweak('A/B/E', wc_rev='?')
Index: subversion/tests/cmdline/utf8_tests.py
===================================================================
--- subversion/tests/cmdline/utf8_tests.py (revision 22413)
+++ subversion/tests/cmdline/utf8_tests.py (working copy)
@@ -118,7 +118,7 @@
localeregex = re.compile('^ISO-?8859-1$', re.I)
localematch = localeregex.search(localeenc)
try:
- svntest.actions.run_and_verify_svn("",svntest.SVNAnyOutput, [],"help")
+ svntest.actions.run_and_verify_svn(None, svntest.SVNAnyOutput, [],"help")
except:
# We won't be able to run the client; this might be because the
# system does not support the iso-8859-1 locale. Anyhow, it makes
Index: subversion/tests/cmdline/commit_tests.py
===================================================================
--- subversion/tests/cmdline/commit_tests.py (revision 22413)
+++ subversion/tests/cmdline/commit_tests.py (working copy)
@@ -1491,7 +1491,7 @@
svntest.main.file_append(os.path.join(wc_dir, file4_path), 'this is file4')
# Add them to version control.
- svntest.actions.run_and_verify_svn("", SVNAnyOutput, [],
+ svntest.actions.run_and_verify_svn(None, SVNAnyOutput, [],
'add', '-N',
os.path.join(wc_dir, file1_path),
os.path.join(wc_dir, dir1_path),
@@ -1592,7 +1592,7 @@
svntest.main.file_append(os.path.join(wc_dir, nocommit_path), 'nocommit')
# Add them to version control.
- svntest.actions.run_and_verify_svn("", SVNAnyOutput, [],
+ svntest.actions.run_and_verify_svn(None, SVNAnyOutput, [],
'add', '-N',
os.path.join(wc_dir, dirA_path),
os.path.join(wc_dir, fileA_path),
Index: subversion/tests/cmdline/authz_tests.py
===================================================================
--- subversion/tests/cmdline/authz_tests.py (revision 22413)
+++ subversion/tests/cmdline/authz_tests.py (working copy)
@@ -202,7 +202,7 @@
expected_err = ".*svn: Authorization failed.*"
# create some folders with spaces in their names
- svntest.actions.run_and_verify_svn("", None, [],
+ svntest.actions.run_and_verify_svn(None, None, [],
'mkdir',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
@@ -237,7 +237,7 @@
chi_url)
# read a remote file, unreadable: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'cat',
'--username', svntest.main.wc_author,
@@ -245,7 +245,7 @@
lambda_url)
# read a remote file, unreadable through recursion: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'cat',
'--username', svntest.main.wc_author,
@@ -267,21 +267,21 @@
root_url)
# open a remote folder(ls), unreadable: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, svntest.SVNAnyOutput, 'ls',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
B_url)
# open a remote folder(ls) with spaces, should succeed
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, [], 'ls',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
B_url+'/folder with spaces/empty folder')
# open a remote folder(ls), unreadable through recursion: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'ls',
'--username', svntest.main.wc_author,
@@ -289,14 +289,14 @@
E_url)
# copy a remote file
- svntest.actions.run_and_verify_svn("", None, [], 'cp',
+ svntest.actions.run_and_verify_svn(None, None, [], 'cp',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
iota_url, D_url,
'-m', 'logmsg')
# copy a remote file, source is unreadable: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'cp',
'--username', svntest.main.wc_author,
@@ -305,14 +305,14 @@
lambda_url, D_url)
# copy a remote folder
- svntest.actions.run_and_verify_svn("", None, [], 'cp',
+ svntest.actions.run_and_verify_svn(None, None, [], 'cp',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
C_url, D_url,
'-m', 'logmsg')
# copy a remote folder, source is unreadable: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'cp',
'--username', svntest.main.wc_author,
@@ -350,7 +350,7 @@
D_url = A_url + '/D'
# copy a remote file, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'cp',
'--username', svntest.main.wc_author,
@@ -359,7 +359,7 @@
lambda_url, D_url)
# copy a remote folder, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'cp',
'--username', svntest.main.wc_author,
@@ -368,7 +368,7 @@
E_url, D_url)
# delete a file, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'rm',
'--username', svntest.main.wc_author,
@@ -377,7 +377,7 @@
iota_url)
# delete a folder, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'rm',
'--username', svntest.main.wc_author,
@@ -386,7 +386,7 @@
D_url)
# create a folder, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'mkdir',
'--username', svntest.main.wc_author,
@@ -395,7 +395,7 @@
A_url+'/newfolder')
# move a remote file, source is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'mv',
'--username', svntest.main.wc_author,
@@ -404,7 +404,7 @@
mu_url, C_url)
# move a remote folder, source is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'mv',
'--username', svntest.main.wc_author,
@@ -413,7 +413,7 @@
D_url, C_url)
# move a remote file, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'mv',
'--username', svntest.main.wc_author,
@@ -422,7 +422,7 @@
lambda_url, D_url)
# move a remote folder, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'mv',
'--username', svntest.main.wc_author,
@@ -434,7 +434,7 @@
expected_err = ".*svn: Authorization failed.*"
# lock a file, target is readonly: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'lock',
'--username', svntest.main.wc_author,
@@ -615,7 +615,7 @@
'ci', '-m', 'changed file rho', sbox.wc_dir)
# copy a remote file
- svntest.actions.run_and_verify_svn("", None, [], 'cp',
+ svntest.actions.run_and_verify_svn(None, None, [], 'cp',
'--username', svntest.main.wc_author,
'--password', svntest.main.wc_passwd,
rho_path, D_url,
@@ -636,7 +636,7 @@
# changed file in this rev. is not readable anymore, so author and date
# should be hidden, like this:
# r2 | (no author) | (no date) | 1 line
- svntest.actions.run_and_verify_svn("", ".*(no author).*(no date).*", [],
+ svntest.actions.run_and_verify_svn(None, ".*(no author).*(no date).*", [],
'log', '-r', '2', '--limit', '1',
wc_dir)
@@ -647,18 +647,18 @@
# if we do the same thing directly on the unreadable file, we get:
# svn: Item is not readable
- svntest.actions.run_and_verify_svn("", None, expected_err2,
+ svntest.actions.run_and_verify_svn(None, None, expected_err2,
'log', rho_path)
# while the HEAD rev of the copy is readable in /A/D, its parent in
# /A/D/G is not, so don't spill any info there either.
- svntest.actions.run_and_verify_svn("", ".*(no author).*(no date).*", [],
+ svntest.actions.run_and_verify_svn(None, ".*(no author).*(no date).*", [],
'log', '-r', '2', '--limit', '1', D_url)
## cat
# now see if we can look at the older version of rho
- svntest.actions.run_and_verify_svn("", None, expected_err,
+ svntest.actions.run_and_verify_svn(None, None, expected_err,
'cat', '-r', '2', D_url+'/rho')
if sbox.repo_url.startswith('http'):
@@ -666,19 +666,19 @@
else:
expected_err2 = ".*svn: Unreadable path encountered; access denied.*"
- svntest.actions.run_and_verify_svn("", None, expected_err2,
+ svntest.actions.run_and_verify_svn(None, None, expected_err2,
'cat', '-r', '2', G_url+'/rho')
## diff
# we shouldn't see the diff of a file in an unreadable path
- svntest.actions.run_and_verify_svn("", None, expected_err,
+ svntest.actions.run_and_verify_svn(None, None, expected_err,
'diff', '-r', 'HEAD', G_url+'/rho')
- svntest.actions.run_and_verify_svn("", None, expected_err,
+ svntest.actions.run_and_verify_svn(None, None, expected_err,
'diff', '-r', '2', D_url+'/rho')
- svntest.actions.run_and_verify_svn("", None, expected_err,
+ svntest.actions.run_and_verify_svn(None, None, expected_err,
'diff', '-r', '2:4', D_url+'/rho')
# test whether read access is correctly granted and denied
@@ -706,7 +706,7 @@
iota_url = root_url + '/iota'
# copy a remote file, target is readonly for jconstant: should fail
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, expected_err,
'cp',
'--username', svntest.main.wc_author2,
@@ -715,7 +715,7 @@
iota_url, B_url)
# try the same action, but as user jray (alias of jrandom), should work.
- svntest.actions.run_and_verify_svn("",
+ svntest.actions.run_and_verify_svn(None,
None, [],
'cp',
'--username', svntest.main.wc_author,
Received on Fri Nov 24 06:07:53 2006