You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/02/09 17:46:21 UTC
svn commit: r1658462 [14/31] - in /subversion/branches/move-tracking-2: ./
build/ build/generator/ build/generator/templates/ notes/ subversion/
subversion/bindings/cxxhl/include/svncxxhl/
subversion/bindings/javahl/native/ subversion/bindings/javahl/n...
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/basic_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/basic_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/basic_tests.py Mon Feb 9 16:46:16 2015
@@ -60,8 +60,7 @@ def basic_checkout(sbox):
# Checkout of a different URL into a working copy fails
A_url = sbox.repo_url + '/A'
- svntest.actions.run_and_verify_svn("No error where some expected",
- None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
# "Obstructed update",
'co', A_url,
wc_dir)
@@ -73,7 +72,7 @@ def basic_checkout(sbox):
os.remove(lambda_path)
G_path = sbox.ospath('A/D/G')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', G_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', G_path)
expected_output = svntest.actions.get_virginal_state(wc_dir, 1)
expected_output.tweak('A/mu', status='M ')
@@ -88,7 +87,7 @@ def basic_checkout(sbox):
# Repeat checkout of original URL into working copy with modifications
url = sbox.repo_url
- svntest.actions.run_and_verify_svn("Repeat checkout failed", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'co', url,
wc_dir)
@@ -208,18 +207,16 @@ def basic_update(sbox):
xx_path = sbox.ospath('xx/xx')
expected_err = "svn: E155007: "
svntest.actions.run_and_verify_svn(
- "update xx/xx",
["Skipped '"+xx_path+"'\n", ],
expected_err,
'update', xx_path)
svntest.actions.run_and_verify_svn(
- "update xx/xx", [], expected_err,
+ [], expected_err,
'update', '--quiet', xx_path)
# Unversioned paths, that are not the only targets of the command are
# skipped without an error
svntest.actions.run_and_verify_svn(
- "update A/mu xx/xx",
["Updating '"+mu_path+"':\n",
"At revision 2.\n",
"Skipped '"+xx_path+"'\n",
@@ -228,7 +225,6 @@ def basic_update(sbox):
] + svntest.main.summary_of_conflicts(skipped_paths=1),
[], 'update', mu_path, xx_path)
svntest.actions.run_and_verify_svn(
- "update A/mu xx/xx",
[], [], 'update', '--quiet', mu_path, xx_path)
#----------------------------------------------------------------------
@@ -240,8 +236,7 @@ def basic_mkdir_url(sbox):
Y_url = sbox.repo_url + '/Y'
Y_Z_url = sbox.repo_url + '/Y/Z'
- svntest.actions.run_and_verify_svn("mkdir URL URL/subdir",
- ["Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(["Committing transaction...\n",
"Committed revision 2.\n"], [],
'mkdir', '-m', 'log_msg', Y_url, Y_Z_url)
@@ -279,20 +274,17 @@ def basic_mkdir_url_with_parents(sbox):
U_url = sbox.repo_url + '/U'
U_V_url = sbox.repo_url + '/U/V'
U_V_W_url = sbox.repo_url + '/U/V/W'
- svntest.actions.run_and_verify_svn("erroneous mkdir sans --parents",
- None,
+ svntest.actions.run_and_verify_svn(None,
".*Try 'svn mkdir --parents' instead.*",
'mkdir', '-m', 'log_msg',
X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_W_url)
- svntest.actions.run_and_verify_svn("mkdir",
- ["Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(["Committing transaction...\n",
"Committed revision 2.\n"], [],
'mkdir', '-m', 'log_msg',
X_url, U_url)
- svntest.actions.run_and_verify_svn("mkdir --parents",
- ["Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(["Committing transaction...\n",
"Committed revision 3.\n"], [],
'mkdir', '-m', 'log_msg', '--parents',
X_Y_Z_url, X_Y_Z2_url, X_T_C_url, U_V_W_url)
@@ -347,11 +339,11 @@ def basic_mkdir_wc_with_parents(sbox):
Y_Z_path = sbox.ospath('Y/Z')
- svntest.actions.run_and_verify_svn("erroneous mkdir dir/subdir", [],
+ svntest.actions.run_and_verify_svn([],
".*Try 'svn mkdir --parents' instead.*",
'mkdir', Y_Z_path)
- svntest.actions.run_and_verify_svn("mkdir dir/subdir", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '--parents', Y_Z_path)
# Verify the WC status, because there was a regression in which parts of
@@ -452,7 +444,7 @@ def basic_update_corruption(sbox):
# Make the "other" working copy
other_wc = sbox.add_wc_path('other')
- svntest.actions.run_and_verify_svn("Checkout to wc2", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'co', sbox.repo_url, other_wc)
# Make a local mod to mu
@@ -774,7 +766,7 @@ def basic_cleanup(sbox):
svntest.main.safe_rmtree(tmp_path)
# Run cleanup (### todo: cleanup doesn't currently print anything)
- svntest.actions.run_and_verify_svn("Cleanup command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cleanup', wc_dir)
# Verify unlocked status.
@@ -802,12 +794,12 @@ def basic_revert(sbox):
svntest.main.file_append(rho_path, "Added some text to 'rho'.\n")
svntest.main.file_append(zeta_path, "Added some text to 'zeta'.\n")
- svntest.actions.run_and_verify_svn("Add command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'add', zeta_path)
- svntest.actions.run_and_verify_svn("Add prop command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ps', 'random-prop', 'propvalue',
gamma_path)
- svntest.actions.run_and_verify_svn("Add prop command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ps', 'random-prop', 'propvalue',
iota_path)
@@ -823,19 +815,19 @@ def basic_revert(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_output)
# Run revert (### todo: revert doesn't currently print anything)
- svntest.actions.run_and_verify_svn("Revert command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', beta_path)
- svntest.actions.run_and_verify_svn("Revert command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', gamma_path)
- svntest.actions.run_and_verify_svn("Revert command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', iota_path)
- svntest.actions.run_and_verify_svn("Revert command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', rho_path)
- svntest.actions.run_and_verify_svn("Revert command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', zeta_path)
# Verify unmodified status.
@@ -867,7 +859,7 @@ def basic_revert(sbox):
# Finally, check that reverted file is not readonly
os.remove(beta_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', beta_path)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', beta_path)
if not (open(beta_path, 'r+')):
raise svntest.Failure
@@ -875,7 +867,7 @@ def basic_revert(sbox):
# removed, can be reverted.
X_path = sbox.ospath('X')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', X_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', X_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
@@ -884,7 +876,7 @@ def basic_revert(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
svntest.main.safe_rmtree(X_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', X_path)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', X_path)
expected_status.remove('X')
svntest.actions.run_and_verify_status(wc_dir, expected_status)
@@ -896,7 +888,7 @@ def basic_revert(sbox):
### Most of the rest of this test is ineffective, due to the
### problems described in issue #1611.
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', E_path)
+ svntest.actions.run_and_verify_svn(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='?')
@@ -937,7 +929,7 @@ def basic_revert(sbox):
# try updating instead."
#
# ...but due to test suite lossage, it'll still look like success.
- svntest.actions.run_and_verify_svn(None, None, [], 'revert', E_path)
+ svntest.actions.run_and_verify_svn(None, [], 'revert', E_path)
### FIXME: Again, the problem described in issue #1611 bites us here.
#
@@ -977,7 +969,7 @@ def basic_switch(sbox):
# First, try the switch without the --ignore-ancestry flag,
# expecting failure.
expected_error = "svn: E195012: .*no common ancestry.*"
- svntest.actions.run_and_verify_svn(None, None, expected_error,
+ svntest.actions.run_and_verify_svn(None, expected_error,
'switch', gamma_url, iota_path)
# Now ignore ancestry so we can ge through this switch.
@@ -1037,7 +1029,7 @@ def basic_switch(sbox):
# First, try the switch without the --ignore-ancestry flag,
# expecting failure.
expected_error = "svn: E195012: .*no common ancestry.*"
- svntest.actions.run_and_verify_svn(None, None, expected_error,
+ svntest.actions.run_and_verify_svn(None, expected_error,
'switch', ADG_url, ADH_path)
# Do the switch and check the results in three ways.
@@ -1129,31 +1121,31 @@ def basic_delete(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_output)
# 'svn rm' that should fail
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', chi_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', chi_parent_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', rho_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', rho_parent_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', F_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', F_parent_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', sigma_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', sigma_parent_path)
- svntest.actions.run_and_verify_svn(None, None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'rm', X_path)
# check status has not changed
@@ -1161,22 +1153,22 @@ def basic_delete(sbox):
# 'svn rm' that should work
E_path = sbox.ospath('A/B/E')
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', E_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', E_path)
# 'svn rm --force' that should work
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--force',
+ svntest.actions.run_and_verify_svn(None, [], 'rm', '--force',
chi_parent_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force', rho_parent_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force', F_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force', sigma_parent_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force', X_path)
# Deleting an unchanged copy shouldn't error.
@@ -1188,18 +1180,18 @@ def basic_delete(sbox):
# Deleting already removed from wc versioned item with --force
iota_path = sbox.ospath('iota')
os.remove(iota_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force', iota_path)
# and without --force
gamma_path = sbox.ospath('A/D/gamma')
os.remove(gamma_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', gamma_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', gamma_path)
# Deleting already scheduled for deletion doesn't require --force
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', gamma_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', gamma_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', E_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', E_path)
# check status
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
@@ -1225,7 +1217,7 @@ def basic_delete(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# issue 687 delete directory with uncommitted directory child
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force', Y_parent_path)
expected_status.tweak('A/D', status='D ')
@@ -1258,22 +1250,21 @@ def basic_delete(sbox):
# Deleting unversioned file explicitly
foo_path = sbox.ospath('foo')
svntest.main.file_append(foo_path, 'unversioned foo')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force', foo_path)
verify_file_deleted("Failed to remove unversioned file foo", foo_path)
# At one stage deleting a URL dumped core
iota_URL = sbox.repo_url + '/iota'
- svntest.actions.run_and_verify_svn(None,
- ["Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(["Committing transaction...\n",
"Committed revision 2.\n"], [],
'rm', '-m', 'delete iota URL',
iota_URL)
# Issue 4074, deleting a root url SEGV.
expected_error = 'svn: E170000: .*not within a repository'
- svntest.actions.run_and_verify_svn(None, [], expected_error,
+ svntest.actions.run_and_verify_svn([], expected_error,
'rm', sbox.repo_url,
'--message', 'delete root')
@@ -1287,8 +1278,7 @@ def basic_checkout_deleted(sbox):
# Delete A/D and commit.
D_path = sbox.ospath('A/D')
- svntest.actions.run_and_verify_svn("error scheduling A/D for deletion",
- None, [], 'rm', '--force', D_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', '--force', D_path)
expected_output = wc.State(wc_dir, {
'A/D' : Item(verb='Deleting'),
@@ -1306,8 +1296,7 @@ def basic_checkout_deleted(sbox):
# Now try to checkout revision 1 of A/D.
url = sbox.repo_url + '/A/D'
wc2 = sbox.ospath('new_D')
- svntest.actions.run_and_verify_svn("error checking out r1 of A/D",
- None, [], 'co', '-r', '1',
+ svntest.actions.run_and_verify_svn(None, [], 'co', '-r', '1',
url + "@1", wc2)
#----------------------------------------------------------------------
@@ -1331,7 +1320,7 @@ def basic_node_kind_change(sbox):
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Try and fail to create a directory (file scheduled for deletion)
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', gamma_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', gamma_path)
# Status is replaced
expected_status.tweak('A/D/gamma', status='R ')
@@ -1348,19 +1337,18 @@ def basic_node_kind_change(sbox):
None, wc_dir)
# Try and fail to create a directory (file deleted)
- svntest.actions.run_and_verify_svn(None,
- None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'mkdir', gamma_path)
# Status is unchanged
svntest.actions.run_and_verify_status(wc_dir, expected_status)
# Update to finally get rid of file
- svntest.actions.run_and_verify_svn(None, None, [], 'up', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
# mkdir should succeed
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', gamma_path)
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', gamma_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', gamma_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', gamma_path)
expected_status.tweak(wc_rev=2)
expected_status.add({
@@ -1384,7 +1372,7 @@ def basic_import(sbox):
# import new files into repository
url = sbox.repo_url + "/dirA/dirB/new_file"
exit_code, output, errput = svntest.actions.run_and_verify_svn(
- 'Cannot change node kind', None, [], 'import',
+ None, [], 'import',
'-m', 'Log message for new import', new_path, url)
lastline = output.pop().strip()
@@ -1439,7 +1427,7 @@ def basic_cat(sbox):
# Get repository text even if wc is modified
svntest.main.file_append(mu_path, "some text")
- svntest.actions.run_and_verify_svn(None, ["This is the file 'mu'.\n"],
+ svntest.actions.run_and_verify_svn(["This is the file 'mu'.\n"],
[], 'cat',
###TODO is user/pass really necessary?
mu_path)
@@ -1458,33 +1446,27 @@ def basic_ls(sbox):
cwd = os.getcwd()
os.chdir(wc_dir)
- svntest.actions.run_and_verify_svn("ls implicit current directory",
- ["A/\n", "iota\n"],
+ svntest.actions.run_and_verify_svn(["A/\n", "iota\n"],
[], 'ls')
os.chdir(cwd)
- svntest.actions.run_and_verify_svn('ls the root of working copy',
- ['A/\n', 'iota\n'],
+ svntest.actions.run_and_verify_svn(['A/\n', 'iota\n'],
[], 'ls',
wc_dir)
- svntest.actions.run_and_verify_svn('ls a working copy directory',
- ['B/\n', 'C/\n', 'D/\n', 'mu\n'],
+ svntest.actions.run_and_verify_svn(['B/\n', 'C/\n', 'D/\n', 'mu\n'],
[], 'ls',
sbox.ospath('A'))
- svntest.actions.run_and_verify_svn('ls working copy directory with -r BASE',
- ['B/\n', 'C/\n', 'D/\n', 'mu\n'],
+ svntest.actions.run_and_verify_svn(['B/\n', 'C/\n', 'D/\n', 'mu\n'],
[], 'ls', '-r', 'BASE',
sbox.ospath('A'))
- svntest.actions.run_and_verify_svn('ls a single file',
- ['mu\n'],
+ svntest.actions.run_and_verify_svn(['mu\n'],
[], 'ls',
sbox.ospath('A/mu'))
- svntest.actions.run_and_verify_svn('recursive ls',
- ['E/\n', 'E/alpha\n', 'E/beta\n', 'F/\n',
+ svntest.actions.run_and_verify_svn(['E/\n', 'E/alpha\n', 'E/beta\n', 'F/\n',
'lambda\n' ], [], 'ls', '-R',
sbox.ospath('A/B'))
@@ -1519,7 +1501,7 @@ def nonexistent_repository(sbox):
# the root directory, the test could fail, and that's just too bad :-).
exit_code, output, errput = svntest.actions.run_and_verify_svn(
- None, None, svntest.verify.AnyOutput,
+ None, svntest.verify.AnyOutput,
'log', 'file:///nonexistent_path')
for line in errput:
@@ -1547,18 +1529,18 @@ def basic_auth_cache(sbox):
svntest.main.safe_rmtree(wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'checkout',
repo_url, wc_dir)
# Failed with "not locked" error on missing directory
svntest.main.safe_rmtree(sbox.ospath('A/B/E'))
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'status', '-u',
sbox.ospath('A/B'))
# Failed with "already locked" error on new dir
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'copy',
repo_url + '/A/B/E',
sbox.ospath('A/D/G'))
@@ -1587,7 +1569,7 @@ def basic_add_ignores(sbox):
open(foo_o_path, 'w')
exit_code, output, err = svntest.actions.run_and_verify_svn(
- "No output where some expected", svntest.verify.AnyOutput, [],
+ svntest.verify.AnyOutput, [],
'add', dir_path)
for line in output:
@@ -1611,11 +1593,11 @@ def basic_add_local_ignores(sbox):
dir_path = sbox.ospath('dir')
file_path = os.path.join(dir_path, 'app.lock')
- svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
'mkdir', dir_path)
svntest.main.run_svn(None, 'propset', 'svn:ignore', '*.lock', dir_path)
open(file_path, 'w')
- svntest.actions.run_and_verify_svn(None, [], [],
+ svntest.actions.run_and_verify_svn([], [],
'add', '--force', dir_path)
#----------------------------------------------------------------------
@@ -1640,7 +1622,7 @@ def basic_add_no_ignores(sbox):
open(foo_rej_path, 'w')
exit_code, output, err = svntest.actions.run_and_verify_svn(
- "No output where some expected", svntest.verify.AnyOutput, [],
+ svntest.verify.AnyOutput, [],
'add', '--no-ignore', dir_path)
for line in output:
@@ -1675,7 +1657,7 @@ def basic_add_parents(sbox):
o.close()
# Add the file, with it's parents
- svntest.actions.run_and_verify_svn(None, None, [], 'add', '--parents',
+ svntest.actions.run_and_verify_svn(None, [], 'add', '--parents',
zeta_path)
# Build expected state
@@ -1701,10 +1683,10 @@ def basic_add_parents(sbox):
None,
wc_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', X_path, '--keep-local')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'add', '--parents', zeta_path)
#----------------------------------------------------------------------
@@ -1718,8 +1700,7 @@ def uri_syntax(sbox):
url = sbox.repo_url
scheme = url[:url.find(":")]
url = scheme + "://some_nonexistent_host_with_no_trailing_slash"
- svntest.actions.run_and_verify_svn("No error where one expected",
- None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'co', url, local_dir)
# Different RA layers give different errors for failed checkouts;
@@ -1815,15 +1796,15 @@ def basic_peg_revision(sbox):
# Without the trailing "@", expect failure.
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, None, ".*Syntax error parsing peg revision 'abc'", 'cat', wc_file)
+ None, ".*Syntax error parsing peg revision 'abc'", 'cat', wc_file)
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, None, ".*Syntax error parsing peg revision 'abc'", 'cat', url)
+ None, ".*Syntax error parsing peg revision 'abc'", 'cat', url)
# With the trailing "@", expect success.
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, ["xyz\n"], [], 'cat', wc_file + '@')
+ ["xyz\n"], [], 'cat', wc_file + '@')
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, ["xyz\n"], [], 'cat', url + '@')
+ ["xyz\n"], [], 'cat', url + '@')
# Test with leading @ character in filename.
filename = '@abc'
@@ -1832,23 +1813,23 @@ def basic_peg_revision(sbox):
svntest.main.file_append(wc_file, 'xyz\n')
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, None, [], 'add', wc_file + '@')
+ None, [], 'add', wc_file + '@')
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, None, [], 'ci', '-m', 'secret log msg', wc_file + '@')
+ None, [], 'ci', '-m', 'secret log msg', wc_file + '@')
# With a leading "@" which isn't escaped, expect failure.
# Note that we just test with filename starting with '@', because
# wc_file + '@' + filename is a different situation where svn
# will try to parse filename as a peg revision.
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, None, ".*'%s' is just a peg revision.*" % filename,
+ None, ".*'%s' is just a peg revision.*" % filename,
'cat', filename)
# With a leading "@" which is escaped, expect success.
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, ["xyz\n"], [], 'cat', wc_file + '@')
+ ["xyz\n"], [], 'cat', wc_file + '@')
exit_code, output, errlines = svntest.actions.run_and_verify_svn(
- None, ["xyz\n"], [], 'cat', repos_dir + '/' + filename + '@')
+ ["xyz\n"], [], 'cat', repos_dir + '/' + filename + '@')
def info_nonhead(sbox):
"info on file not existing in HEAD"
@@ -1860,7 +1841,7 @@ def info_nonhead(sbox):
furl = repo_url + "/iota"
# Remove iota and commit.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
"delete", fname)
expected_output = svntest.wc.State(wc_dir, {
'iota' : Item(verb='Deleting'),
@@ -1890,8 +1871,7 @@ def ls_nonhead(sbox):
# Delete A/D/rho and commit.
G_path = sbox.ospath('A/D/G')
- svntest.actions.run_and_verify_svn("error scheduling A/D/G for deletion",
- None, [], 'rm', G_path)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', G_path)
expected_output = wc.State(wc_dir, {
'A/D/G' : Item(verb='Deleting'),
@@ -1906,7 +1886,7 @@ def ls_nonhead(sbox):
# Check that we can list a file in A/D/G at revision 1.
rho_url = sbox.repo_url + "/A/D/G/rho"
- svntest.actions.run_and_verify_svn(None, '.* rho\n', [],
+ svntest.actions.run_and_verify_svn('.* rho\n', [],
'ls', '--verbose', rho_url + '@1')
@@ -1922,12 +1902,10 @@ def cat_added_PREV(sbox):
# Create and add a file.
svntest.main.file_append(f_path, 'new text')
- svntest.actions.run_and_verify_svn("adding file",
- None, [], 'add', f_path)
+ svntest.actions.run_and_verify_svn(None, [], 'add', f_path)
# Cat'ing the previous version should fail.
- svntest.actions.run_and_verify_svn("cat PREV version of file",
- None, ".*has no committed revision.*",
+ svntest.actions.run_and_verify_svn(None, ".*has no committed revision.*",
'cat', '-rPREV', f_path)
# Issue #2612.
@@ -1938,8 +1916,7 @@ def ls_space_in_repo_name(sbox):
sbox.build(name = "repo with spaces")
wc_dir = sbox.wc_dir
- svntest.actions.run_and_verify_svn('ls the root of the repository',
- ['A/\n', 'iota\n'],
+ svntest.actions.run_and_verify_svn(['A/\n', 'iota\n'],
[], 'ls',
sbox.repo_url)
@@ -1953,11 +1930,11 @@ def delete_keep_local(sbox):
C_path = sbox.ospath('A/C')
# Remove file iota
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--keep-local',
+ svntest.actions.run_and_verify_svn(None, [], 'rm', '--keep-local',
iota_path)
# Remove directory 'A/C'
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--keep-local',
+ svntest.actions.run_and_verify_svn(None, [], 'rm', '--keep-local',
C_path)
# Commit changes
@@ -1994,10 +1971,10 @@ def delete_keep_local_twice(sbox):
dir = sbox.ospath('dir')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', dir)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--keep-local', dir)
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', '--keep-local', dir)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', '--keep-local', dir)
+ svntest.actions.run_and_verify_svn(None, [], 'rm', '--keep-local', dir)
if not os.path.isdir(dir):
logger.warn('Directory was really deleted')
@@ -2029,34 +2006,34 @@ def special_paths_in_repos(sbox):
test_file_url = test_url + '/' + test_url[test_url.rindex('/')+1:]
# do some manipulations on a folder which problematic names
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'log_msg',
test_url)
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'-m', 'log_msg',
'put', test_file_source,
test_file_url)
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'propset', '-m', 'log_msg',
'propname', 'propvalue', test_url)
- svntest.actions.run_and_verify_svn(None, 'propvalue', [],
+ svntest.actions.run_and_verify_svn('propvalue', [],
'propget', 'propname', test_url)
- svntest.actions.run_and_verify_svnmucc(None, None, [],
+ svntest.actions.run_and_verify_svnmucc(None, [],
'propset', '-m', 'log_msg',
'propname', 'propvalue', test_file_url)
- svntest.actions.run_and_verify_svn(None, 'propvalue', [],
+ svntest.actions.run_and_verify_svn('propvalue', [],
'propget', 'propname', test_file_url)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '-m', 'log_msg',
test_file_url)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '-m', 'log_msg',
test_url)
@@ -2071,7 +2048,7 @@ def basic_rm_urls_one_repo(sbox):
# Test 1: remotely delete one directory
E_url = repo_url + '/A/B/E'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '-m', 'log_msg',
E_url)
@@ -2094,7 +2071,7 @@ def basic_rm_urls_one_repo(sbox):
F_url = repo_url + '/A/B/F'
C_url = repo_url + '/A/C'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '-m', 'log_msg',
F_url, C_url)
@@ -2131,8 +2108,7 @@ def basic_rm_urls_multi_repos(sbox):
other_repo_dir, other_repo_url = sbox.add_repo_path("other")
svntest.main.copy_repos(repo_dir, other_repo_dir, 1, 1)
other_wc_dir = sbox.add_wc_path("other")
- svntest.actions.run_and_verify_svn("Unexpected error during co",
- svntest.verify.AnyOutput, [], "co",
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], "co",
other_repo_url,
other_wc_dir)
@@ -2142,7 +2118,7 @@ def basic_rm_urls_multi_repos(sbox):
F2_url = other_repo_url + '/A/B/F'
C2_url = other_repo_url + '/A/C'
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', '-m', 'log_msg',
+ svntest.actions.run_and_verify_svn(None, [], 'rm', '-m', 'log_msg',
F_url, C_url, F2_url, C2_url)
# Check that the two rm's to each of the repositories were handled in one
@@ -2329,46 +2305,43 @@ def automatic_conflict_resolution(sbox):
# resolve' with the respective "--accept[mine|orig|repo]" flag.
# But first, check --accept actions resolved does not accept.
- svntest.actions.run_and_verify_svn(None,
- # stdout, stderr
+ svntest.actions.run_and_verify_svn(# stdout, stderr
None,
".*invalid 'accept' ARG",
'resolve', '--accept=postpone')
- svntest.actions.run_and_verify_svn(None,
- # stdout, stderr
+ svntest.actions.run_and_verify_svn(# stdout, stderr
None,
".*invalid 'accept' ARG",
'resolve', '--accept=edit',
'--force-interactive')
- svntest.actions.run_and_verify_svn(None,
- # stdout, stderr
+ svntest.actions.run_and_verify_svn(# stdout, stderr
None,
".*invalid 'accept' ARG",
'resolve', '--accept=launch',
'--force-interactive')
# Run 'svn resolved --accept=NOPE. Using omega for the test.
- svntest.actions.run_and_verify_svn("Resolve command", None,
+ svntest.actions.run_and_verify_svn(None,
".*NOPE' is not a valid --accept value",
'resolve',
'--accept=NOPE',
omega_path_backup)
# Resolve lambda, mu, and rho with different --accept options.
- svntest.actions.run_and_verify_svn("Resolve command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'resolve', '--accept=base',
lambda_path_backup)
- svntest.actions.run_and_verify_svn("Resolve command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'resolve',
'--accept=mine-full',
mu_path_backup)
- svntest.actions.run_and_verify_svn("Resolve command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'resolve',
'--accept=theirs-full',
rho_path_backup)
fp = open(tau_path_backup, 'w')
fp.write("Resolution text for 'tau'.\n")
fp.close()
- svntest.actions.run_and_verify_svn("Resolve command", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'resolve',
'--accept=working',
tau_path_backup)
@@ -2459,8 +2432,7 @@ def basic_relative_url_using_current_dir
orig_dir = os.getcwd()
os.chdir(sbox.wc_dir)
- exit_code, output, error = svntest.actions.run_and_verify_svn(None,
- expected_output, [],
+ exit_code, output, error = svntest.actions.run_and_verify_svn(expected_output, [],
'blame', '^/iota')
os.chdir(orig_dir)
@@ -2492,8 +2464,7 @@ def basic_relative_url_using_other_targe
" 3 jrandom New contents for mu\n",
]
- exit_code, output, error = svntest.actions.run_and_verify_svn(None,
- expected_output, [], 'blame',
+ exit_code, output, error = svntest.actions.run_and_verify_svn(expected_output, [], 'blame',
'^/iota', mu_url)
def basic_relative_url_multi_repo(sbox):
@@ -2507,8 +2478,7 @@ def basic_relative_url_multi_repo(sbox):
repo_dir2, repo_url2 = sbox.add_repo_path("other")
svntest.main.copy_repos(repo_dir1, repo_dir2, 1, 1)
wc_dir2 = sbox.add_wc_path("other")
- svntest.actions.run_and_verify_svn("Unexpected error during co",
- svntest.verify.AnyOutput, [], "co",
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [], "co",
repo_url2,
wc_dir2)
@@ -2516,7 +2486,7 @@ def basic_relative_url_multi_repo(sbox):
iota_url_repo1 = repo_url1 + '/iota'
iota_url_repo2 = repo_url2 + '/iota'
- exit_code, output, error = svntest.actions.run_and_verify_svn(None, [],
+ exit_code, output, error = svntest.actions.run_and_verify_svn([],
svntest.verify.AnyOutput, 'blame',
'^/A/mu', iota_url_repo1, iota_url_repo2)
@@ -2535,12 +2505,10 @@ def basic_relative_url_non_canonical(sbo
"iota\n"
]
- exit_code, output, error = svntest.actions.run_and_verify_svn(None,
- expected_output, [], 'ls',
+ exit_code, output, error = svntest.actions.run_and_verify_svn(expected_output, [], 'ls',
'^/A/', iota_url)
- exit_code, output, error = svntest.actions.run_and_verify_svn(None,
- expected_output, [], 'ls',
+ exit_code, output, error = svntest.actions.run_and_verify_svn(expected_output, [], 'ls',
'^//A/', iota_url)
def basic_relative_url_with_peg_revisions(sbox):
@@ -2575,13 +2543,11 @@ def basic_relative_url_with_peg_revision
]
# Canonical version with peg revision
- exit_code, output, error = svntest.actions.run_and_verify_svn(None,
- expected_output, [], 'ls', '-r3',
+ exit_code, output, error = svntest.actions.run_and_verify_svn(expected_output, [], 'ls', '-r3',
'^/A/@3', iota_url)
# Non-canonical version with peg revision
- exit_code, output, error = svntest.actions.run_and_verify_svn(None,
- expected_output, [], 'ls', '-r3',
+ exit_code, output, error = svntest.actions.run_and_verify_svn(expected_output, [], 'ls', '-r3',
'^//A/@3', iota_url)
@@ -2647,7 +2613,7 @@ def basic_add_svn_format_file(sbox):
# The .svn directory and the format file should not be added as this
# breaks the administrative area handling, so we expect some error here
- svntest.actions.run_and_verify_svn(None, None,
+ svntest.actions.run_and_verify_svn(None,
".*reserved name.*",
'add', '--parents', entries_path)
@@ -2664,7 +2630,7 @@ def basic_mkdir_mix_targets(sbox):
Y_url = sbox.repo_url + '/Y'
expected_error = "svn: E200009: Cannot mix repository and working copy targets"
- svntest.actions.run_and_verify_svn(None, None, expected_error,
+ svntest.actions.run_and_verify_svn(None, expected_error,
'mkdir', '-m', 'log_msg', Y_url, 'subdir')
def delete_from_url_with_spaces(sbox):
@@ -2675,15 +2641,15 @@ def delete_from_url_with_spaces(sbox):
sbox.simple_mkdir('Dir With')
sbox.simple_mkdir('Dir With/Spaces')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', sbox.wc_dir, '-m', 'Added dir')
# This fails on 1.6.11 with an escaping error.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', sbox.repo_url + '/Dir%20With%20Spaces',
'-m', 'Deleted')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', sbox.repo_url + '/Dir%20With/Spaces',
'-m', 'Deleted')
@@ -2692,8 +2658,7 @@ def meta_correct_library_being_used(sbox
"verify that neon/serf are compiled if tested"
expected_re = (r'^\* ra_%s :' % svntest.main.options.http_library)
expected_output = svntest.verify.RegexOutput(expected_re, match_all=False)
- svntest.actions.run_and_verify_svn("is $http_library available",
- expected_output, [], '--version')
+ svntest.actions.run_and_verify_svn(expected_output, [], '--version')
def delete_and_add_same_file(sbox):
"commit deletes a file and adds one with same text"
@@ -2789,29 +2754,29 @@ def basic_relocate(sbox):
# No-op relocation of just the scheme.
scheme = repo_url[:repo_url.index('://')+3]
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
+ svntest.actions.run_and_verify_svn(None, [], 'switch', '--relocate',
scheme, scheme, wc_dir)
_verify_url(wc_dir, repo_url)
# No-op relocation of a bit more of the URL.
substring = repo_url[:repo_url.index('://')+7]
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
+ svntest.actions.run_and_verify_svn(None, [], 'switch', '--relocate',
substring, substring, wc_dir)
_verify_url(wc_dir, repo_url)
# Real relocation to OTHER_REPO_URL.
- svntest.actions.run_and_verify_svn(None, None, [], 'switch', '--relocate',
+ svntest.actions.run_and_verify_svn(None, [], 'switch', '--relocate',
repo_url, other_repo_url, wc_dir)
_verify_url(wc_dir, other_repo_url)
# ... and back again, using the newer 'svn relocate' subcommand.
- svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+ svntest.actions.run_and_verify_svn(None, [], 'relocate',
other_repo_url, repo_url, wc_dir)
_verify_url(wc_dir, repo_url)
# To OTHER_REPO_URL again, this time with the single-URL form of
# 'svn relocate'.
- svntest.actions.run_and_verify_svn(None, None, [], 'relocate',
+ svntest.actions.run_and_verify_svn(None, [], 'relocate',
other_repo_url, wc_dir)
_verify_url(wc_dir, other_repo_url)
@@ -2825,19 +2790,19 @@ def delete_urls_with_spaces(sbox):
sbox.build(create_wc = False)
# Create three directories with a space in their name
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir',
sbox.repo_url + '/A spaced',
sbox.repo_url + '/B spaced',
sbox.repo_url + '/C spaced',
'-m', 'Created dirs')
# Try to delete the first
- svntest.actions.run_and_verify_svn(None, None, [], 'rm',
+ svntest.actions.run_and_verify_svn(None, [], 'rm',
sbox.repo_url + '/A spaced',
'-m', 'Deleted A')
# And then two at once
- svntest.actions.run_and_verify_svn(None, None, [], 'rm',
+ svntest.actions.run_and_verify_svn(None, [], 'rm',
sbox.repo_url + '/B spaced',
sbox.repo_url + '/C spaced',
'-m', 'Deleted B and C')
@@ -2850,8 +2815,7 @@ def ls_url_special_characters(sbox):
sbox.repo_url + '%2F' + 'A']
for url in special_urls:
- svntest.actions.run_and_verify_svn('ls URL with special characters',
- ['B/\n', 'C/\n', 'D/\n', 'mu\n'],
+ svntest.actions.run_and_verify_svn(['B/\n', 'C/\n', 'D/\n', 'mu\n'],
[], 'ls',
url)
@@ -2866,7 +2830,7 @@ def ls_multiple_and_non_existent_targets
non_existent_path = sbox.ospath('non-existent')
expected_err = ".*W155010.*"
- svntest.actions.run_and_verify_svn2(None, None, expected_err,
+ svntest.actions.run_and_verify_svn2(None, expected_err,
1, 'ls', non_existent_path)
def non_existent_url_target():
@@ -2874,7 +2838,7 @@ def ls_multiple_and_non_existent_targets
non_existent_url = sbox.repo_url + '/non-existent'
expected_err = ".*W160013.*"
- svntest.actions.run_and_verify_svn2(None, None, expected_err,
+ svntest.actions.run_and_verify_svn2(None, expected_err,
1, 'ls', non_existent_url)
def multiple_wc_targets():
"multiple wc targets"
@@ -2884,7 +2848,7 @@ def ls_multiple_and_non_existent_targets
non_existent_path = sbox.ospath('non-existent')
# All targets are existing
- svntest.actions.run_and_verify_svn2(None, None, [],
+ svntest.actions.run_and_verify_svn2(None, [],
0, 'ls', alpha, beta)
# One non-existing target
@@ -2907,7 +2871,7 @@ def ls_multiple_and_non_existent_targets
non_existent_url = sbox.repo_url + '/non-existent'
# All targets are existing
- svntest.actions.run_and_verify_svn2(None, None, [],
+ svntest.actions.run_and_verify_svn2(None, [],
0, 'ls', alpha, beta)
# One non-existing target
@@ -2962,7 +2926,7 @@ def add_multiple_targets(sbox):
expected_status = svntest.verify.UnorderedOutput(
['A ' + file1 + '\n',
'A ' + file2 + '\n'])
- svntest.actions.run_and_verify_svn(None, expected_status, [],
+ svntest.actions.run_and_verify_svn(expected_status, [],
'status', wc_dir)
@@ -2973,29 +2937,29 @@ def quiet_commits(sbox):
svntest.main.file_append(sbox.ospath('A/mu'), 'xxx')
- svntest.actions.run_and_verify_svn(None, [], [],
+ svntest.actions.run_and_verify_svn([], [],
'commit', sbox.wc_dir,
'--message', 'commit', '--quiet')
- svntest.actions.run_and_verify_svn(None, [], [],
+ svntest.actions.run_and_verify_svn([], [],
'mkdir', sbox.repo_url + '/X',
'--message', 'mkdir URL', '--quiet')
- svntest.actions.run_and_verify_svn(None, [], [],
+ svntest.actions.run_and_verify_svn([], [],
'import', sbox.ospath('A/mu'),
sbox.repo_url + '/f',
'--message', 'import', '--quiet')
- svntest.actions.run_and_verify_svn(None, [], [],
+ svntest.actions.run_and_verify_svn([], [],
'rm', sbox.repo_url + '/f',
'--message', 'rm URL', '--quiet')
- svntest.actions.run_and_verify_svn(None, [], [],
+ svntest.actions.run_and_verify_svn([], [],
'copy', sbox.repo_url + '/X',
sbox.repo_url + '/Y',
'--message', 'cp URL URL', '--quiet')
- svntest.actions.run_and_verify_svn(None, [], [],
+ svntest.actions.run_and_verify_svn([], [],
'move', sbox.repo_url + '/Y',
sbox.repo_url + '/Z',
'--message', 'mv URL URL', '--quiet')
@@ -3049,7 +3013,7 @@ def rm_missing_with_case_clashing_ondisk
# Verify that the casing is not updated, because the path is on-disk.
expected_output = [ 'D %s\n' % iota_path ]
# 'svn rm' iota, should leave IOTA alone.
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'rm', iota_path)
# Test status: the unversioned IOTA should still be there.
@@ -3070,14 +3034,14 @@ def delete_conflicts_one_of_many(sbox):
svntest.main.file_append(sbox.ospath('A/D/G/rho'), 'new rho')
sbox.simple_commit()
svntest.main.file_append(sbox.ospath('A/D/G/rho'), 'conflict rho')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'update', '-r1', '--accept', 'postpone',
wc_dir)
if not os.path.exists(sbox.ospath('A/D/G/rho.mine')):
raise svntest.Failure("conflict file rho.mine missing")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '--force',
sbox.ospath('A/D/G/rho'),
sbox.ospath('A/D/G/tau'))
@@ -3112,10 +3076,10 @@ def peg_rev_on_non_existent_wc_path(sbox
# test something.
sbox.simple_update()
# This currently fails with ENOENT on A/mu3.
- svntest.actions.run_and_verify_svn(None, ['r2\n'], [],
+ svntest.actions.run_and_verify_svn(['r2\n'], [],
'cat', '-r2', sbox.ospath('A3/mu3') + '@3')
os.chdir(sbox.ospath('A4'))
- svntest.actions.run_and_verify_svn(None, ['r2\n'], [],
+ svntest.actions.run_and_verify_svn(['r2\n'], [],
'cat', '-r2', sbox.ospath('mu3') + '@3')
@@ -3132,17 +3096,16 @@ def basic_youngest(sbox):
deep_wc_dir = os.path.join(wc_dir, 'A', 'B', 'E', 'alpha')
bad_wc_dir = os.path.join(wc_dir, 'Z')
- svntest.actions.run_and_verify_svn("'svn youngest' on bad WC path",
- None, svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
'youngest', bad_wc_dir)
for flag, output in [(False, "1\n"), (True, "1")]:
for path in [repos_url, deep_repos_url, wc_dir, deep_wc_dir]:
if flag:
- svntest.actions.run_and_verify_svn("svn youngest", [output], [],
+ svntest.actions.run_and_verify_svn([output], [],
'youngest', '--no-newline', path)
else:
- svntest.actions.run_and_verify_svn("svn youngest", [output], [],
+ svntest.actions.run_and_verify_svn([output], [],
'youngest', path)
@@ -3159,7 +3122,7 @@ def mkdir_parents_target_exists_on_disk(
os.mkdir(Y_path)
os.mkdir(Y_Z_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '--parents', Y_path)
# Y should be added, and Z should not. There was a regression in which Z
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/blame_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/blame_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/blame_tests.py Mon Feb 9 16:46:16 2015
@@ -217,7 +217,7 @@ def blame_in_xml(sbox):
# Retrieve last changed date from svn info
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'log', file_path, '--xml', '-r1:2')
date1 = None
@@ -257,7 +257,7 @@ def blame_in_xml(sbox):
'</blame>\n']
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'blame', file_path, '--xml')
for i in range(0, len(output)):
@@ -287,14 +287,14 @@ def blame_on_unknown_revision(sbox):
None, None, wc_dir)
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'blame', file_path, '-rHEAD:HEAD')
if output[0].find(" - This is the file 'iota'.") == -1:
raise svntest.Failure
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'blame', file_path, '--verbose', '-rHEAD:HEAD')
if output[0].find(" - This is the file 'iota'.") == -1:
@@ -325,12 +325,12 @@ def blame_peg_rev(sbox):
# Check that we get a blame of r1 when we specify a peg revision of r1
# and no explicit revision.
- svntest.actions.run_and_verify_svn(None, expected_output_r1, [],
+ svntest.actions.run_and_verify_svn(expected_output_r1, [],
'blame', 'iota@1')
# Check that an explicit revision overrides the default provided by
# the peg revision.
- svntest.actions.run_and_verify_svn(None, expected_output_r1, [],
+ svntest.actions.run_and_verify_svn(expected_output_r1, [],
'blame', 'iota@2', '-r1')
def blame_eol_styles(sbox):
@@ -364,7 +364,7 @@ def blame_eol_styles(sbox):
None, None, wc_dir)
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'blame', file_path, '-r1:HEAD')
# output is a list of lines, there should be 3 lines
@@ -412,7 +412,7 @@ def blame_ignore_whitespace(sbox):
]
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, expected_output, [],
+ expected_output, [],
'blame', '-x', '-w', file_path)
# commit some changes
@@ -434,7 +434,7 @@ def blame_ignore_whitespace(sbox):
" 2 jrandom C c \n",
]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', '-x', '-w', file_path)
def blame_ignore_eolstyle(sbox):
@@ -474,7 +474,7 @@ def blame_ignore_eolstyle(sbox):
]
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, expected_output, [],
+ expected_output, [],
'blame', '-x', '--ignore-eol-style', file_path)
@@ -490,7 +490,7 @@ def blame_merge_info(sbox):
mu_path = os.path.join(wc_dir, 'trunk', 'A', 'mu')
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [], 'blame', '-g', iota_path)
+ None, [], 'blame', '-g', iota_path)
expected_blame = [
{ 'revision' : 2,
@@ -507,7 +507,7 @@ def blame_merge_info(sbox):
parse_and_verify_blame(output, expected_blame, 1)
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [], 'blame', '-g', '-r10:11', iota_path)
+ None, [], 'blame', '-g', '-r10:11', iota_path)
expected_blame = [
{ 'revision' : None,
@@ -524,7 +524,7 @@ def blame_merge_info(sbox):
parse_and_verify_blame(output, expected_blame, 1)
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [], 'blame', '-g', '-r16:17', mu_path)
+ None, [], 'blame', '-g', '-r16:17', mu_path)
expected_blame = [
{ 'revision' : None,
@@ -557,7 +557,7 @@ def blame_merge_out_of_range(sbox):
upsilon_path = os.path.join(wc_dir, 'trunk', 'A', 'upsilon')
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'blame', '-g', upsilon_path)
expected_blame = [
@@ -599,12 +599,12 @@ def blame_peg_rev_file_not_in_head(sbox)
# Check that we get a blame of r1 when we specify a peg revision of r1
# and no explicit revision.
- svntest.actions.run_and_verify_svn(None, expected_output_r1, [],
+ svntest.actions.run_and_verify_svn(expected_output_r1, [],
'blame', 'iota@1')
# Check that an explicit revision overrides the default provided by
# the peg revision.
- svntest.actions.run_and_verify_svn(None, expected_output_r1, [],
+ svntest.actions.run_and_verify_svn(expected_output_r1, [],
'blame', 'iota@2', '-r1')
def blame_file_not_in_head(sbox):
@@ -616,7 +616,7 @@ def blame_file_not_in_head(sbox):
# Check that a correct error message is printed when blaming a target that
# doesn't exist (in HEAD).
expected_err = ".*notexisting' (is not a file.*|path not found|does not exist)"
- svntest.actions.run_and_verify_svn(None, [], expected_err,
+ svntest.actions.run_and_verify_svn([], expected_err,
'blame', notexisting_url)
@SkipUnless(server_has_mergeinfo)
@@ -631,7 +631,7 @@ def blame_output_after_merge(sbox):
A_url = sbox.repo_url + '/A'
# r2: mv greek tree in trunk.
- svntest.actions.run_and_verify_svn(None, ["Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(["Committing transaction...\n",
"Committed revision 2.\n"], [],
'mv', "--parents", A_url, trunk_A_url,
"-m", "move greek tree to trunk")
@@ -656,7 +656,7 @@ def blame_output_after_merge(sbox):
# r4: create branches/br from trunk
branches_br_url = sbox.repo_url + "/branches/br"
- svntest.actions.run_and_verify_svn(None, ["Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(["Committing transaction...\n",
"Committed revision 4.\n"], [],
'cp', '--parents',
trunk_url, branches_br_url,
@@ -698,7 +698,7 @@ def blame_output_after_merge(sbox):
# r7: merge branches/br back to trunk
trunk_path = os.path.join(wc_dir, "trunk")
- svntest.actions.run_and_verify_svn(wc_dir, None, [], 'merge',
+ svntest.actions.run_and_verify_svn(None, [], 'merge',
'-r', '4:HEAD',
branches_br_url, trunk_path)
expected_output = svntest.wc.State(wc_dir, {
@@ -717,7 +717,7 @@ def blame_output_after_merge(sbox):
" 3 jrandom 5th line in file 'mu'.\n",
" 3 jrandom 6th line in file 'mu'.\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', mu_path)
# Next test with the -g option
@@ -730,7 +730,7 @@ def blame_output_after_merge(sbox):
" 3 jrandom 5th line in file 'mu'.\n",
" 3 jrandom 6th line in file 'mu'.\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', '-g', mu_path)
# Now test with -rN:M
@@ -742,7 +742,7 @@ def blame_output_after_merge(sbox):
" - - 5th line in file 'mu'.\n",
" - - 6th line in file 'mu'.\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', '-r', '4:head', mu_path)
# Next test with the -g option with -rN:M
@@ -754,7 +754,7 @@ def blame_output_after_merge(sbox):
" - - 5th line in file 'mu'.\n",
" - - 6th line in file 'mu'.\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', '-g', '-r', '6:head', mu_path)
#----------------------------------------------------------------------
@@ -810,7 +810,7 @@ def merge_sensitive_blame_and_empty_merg
" 1 jrandom This is the file 'psi'.\n",
"G 3 jrandom trunk edit in revision three.\n",
"G 5 jrandom trunk edit in revision five.\n"]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', '-g', psi_COPY_path)
def blame_multiple_targets(sbox):
@@ -819,53 +819,33 @@ def blame_multiple_targets(sbox):
sbox.build()
# First, make a new revision of iota.
- iota = os.path.join(sbox.wc_dir, 'iota')
- svntest.main.file_append(iota, "New contents for iota\n")
- svntest.main.run_svn(None, 'ci', '-m', '', iota)
+ sbox.simple_append('iota', "New contents for iota\n")
+ sbox.simple_commit()
+ iota = sbox.ospath('iota')
expected_output = [
" 1 jrandom This is the file 'iota'.\n",
" 2 jrandom New contents for iota\n",
]
- def multiple_wc_targets():
- "multiple wc targets"
-
- non_existent = os.path.join(sbox.wc_dir, 'non-existent')
-
- expected_err = ".*W155010.*\n.*E200009.*"
- expected_err_re = re.compile(expected_err, re.DOTALL)
-
- exit_code, output, error = svntest.main.run_svn(1, 'blame',
- non_existent, iota)
-
- # Verify error
- if not expected_err_re.match("".join(error)):
- raise svntest.Failure('blame failed: expected error "%s", but received '
- '"%s"' % (expected_err, "".join(error)))
- svntest.verify.verify_outputs(None, output, None, expected_output, None)
-
- def multiple_url_targets():
- "multiple url targets"
-
- iota_url = sbox.repo_url + '/iota'
- non_existent = sbox.repo_url + '/non-existent'
-
- expected_err = ".*(W160017|W160013|W150000).*\n.*E200009.*"
- expected_err_re = re.compile(expected_err, re.DOTALL)
-
- exit_code, output, error = svntest.main.run_svn(1, 'blame',
- non_existent, iota_url)
+ # We use --force to avoid an early bail from the current blame code,
+ # that performs a property check before the actual blame.
- # Verify error
- if not expected_err_re.match("".join(error)):
- raise svntest.Failure('blame failed: expected error "%s", but received '
- '"%s"' % (expected_err, "".join(error)))
- svntest.verify.verify_outputs(None, output, None, expected_output, None)
+ non_existent = os.path.join(sbox.wc_dir, 'non-existent')
+ svntest.actions.run_and_verify_svn(None,
+ ".*W155010: The node.*non-existent'.*",
+ 'blame', non_existent, iota,
+ '--force')
+
+ iota_url = sbox.repo_url + '/iota'
+ non_existent_url = sbox.repo_url + '/non-existent'
+
+ # SVN_ERR_FS_NOT_FILE | SVN_ERR_FS_NOT_FOUND
+ svntest.actions.run_and_verify_svn(None,
+ ".*W1600(13|17): '.*non-existent' .*not",
+ 'blame', non_existent_url, iota_url,
+ '--force')
- # Test one by one
- multiple_wc_targets()
- multiple_url_targets()
@Issue(4034)
def blame_eol_handling(sbox):
@@ -923,10 +903,10 @@ def blame_eol_handling(sbox):
' %d jrandom line 5 \n' % rev,
]
- svntest.actions.run_and_verify_svn(f1 + '-base', expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', f1)
- svntest.actions.run_and_verify_svn(f2 + '-base', expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', f2)
file_data = 'line 1 ' + eol + \
@@ -952,10 +932,10 @@ def blame_eol_handling(sbox):
' %d jrandom line 5 \n' % rev,
]
- svntest.actions.run_and_verify_svn(f1 + '-modified', expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', f1)
- svntest.actions.run_and_verify_svn(f2 + '-modified', expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', f2)
@@ -984,7 +964,7 @@ def blame_youngest_to_oldest(sbox):
expected_output = [
' %d jrandom %s\n' % (3, orig_line[:-1]),
]
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'blame', '-r4:1', iota_moved)
########################################################################
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/cat_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/cat_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/cat_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/cat_tests.py Mon Feb 9 16:46:16 2015
@@ -59,7 +59,7 @@ def cat_local_directory(sbox):
re.escape(os.path.abspath(A_path)) + \
"' refers to a directory"
- svntest.actions.run_and_verify_svn2(None, None, expected_err,
+ svntest.actions.run_and_verify_svn2(None, expected_err,
1, 'cat', A_path)
def cat_remote_directory(sbox):
@@ -70,7 +70,7 @@ def cat_remote_directory(sbox):
expected_err = "svn: warning: W195007: URL '" + A_url + \
"' refers to a directory\n.*"
- svntest.actions.run_and_verify_svn2(None, None, expected_err,
+ svntest.actions.run_and_verify_svn2(None, expected_err,
1, 'cat', A_url)
def cat_base(sbox):
@@ -101,7 +101,7 @@ def cat_nonexistent_file(sbox):
re.escape(os.path.abspath(bogus_path)) + \
"' is not under version control"
- svntest.actions.run_and_verify_svn2(None, None, expected_err, 1,
+ svntest.actions.run_and_verify_svn2(None, expected_err, 1,
'cat', bogus_path)
def cat_skip_uncattable(sbox):
@@ -128,18 +128,17 @@ def cat_skip_uncattable(sbox):
expected_err = "svn: warning: W200005: '" + \
re.escape(os.path.abspath(item_to_cat)) + \
"' is not under version control"
- svntest.actions.run_and_verify_svn2(None, None, expected_err, 1,
+ svntest.actions.run_and_verify_svn2(None, expected_err, 1,
'cat', item_to_cat)
elif os.path.isdir(item_to_cat):
expected_err = "svn: warning: W195007: '" + \
re.escape(os.path.abspath(item_to_cat)) + \
"' refers to a directory"
- svntest.actions.run_and_verify_svn2(None, None, expected_err, 1,
+ svntest.actions.run_and_verify_svn2(None, expected_err, 1,
'cat', item_to_cat)
else:
- svntest.actions.run_and_verify_svn(None,
- ["This is the file '"+file+"'.\n"],
+ svntest.actions.run_and_verify_svn(["This is the file '"+file+"'.\n"],
[], 'cat', item_to_cat)
G_path = os.path.join(dir_path, 'G')
@@ -149,13 +148,13 @@ def cat_skip_uncattable(sbox):
expected_err1 = "svn: warning: W195007: '" + \
re.escape(os.path.abspath(G_path)) + \
"' refers to a directory\n"
- svntest.actions.run_and_verify_svn2(None, expected_out, expected_err1, 1,
+ svntest.actions.run_and_verify_svn2(expected_out, expected_err1, 1,
'cat', rho_path, G_path)
expected_err2 = "svn: warning: W200005: '" + \
re.escape(os.path.abspath(new_file_path)) + \
"' is not under version control\n"
- svntest.actions.run_and_verify_svn2(None, expected_out, expected_err2, 1,
+ svntest.actions.run_and_verify_svn2(expected_out, expected_err2, 1,
'cat', rho_path, new_file_path)
expected_err3 = expected_err1 + expected_err2 + \
@@ -186,9 +185,9 @@ def cat_unversioned_file(sbox):
iota_path = os.path.join(wc_dir, 'iota')
# Delete a file an commit the deletion.
- svntest.actions.run_and_verify_svn2(None, None, [], 0,
+ svntest.actions.run_and_verify_svn2(None, [], 0,
'delete', iota_path)
- svntest.actions.run_and_verify_svn2(None, None, [], 0,
+ svntest.actions.run_and_verify_svn2(None, [], 0,
'commit', '-m', 'delete a file',
iota_path)
@@ -196,13 +195,13 @@ def cat_unversioned_file(sbox):
expected_error = "svn: warning: W200005: '" + \
re.escape(os.path.abspath(iota_path)) + \
"' is not under version control"
- svntest.actions.run_and_verify_svn2(None, [], expected_error, 1,
+ svntest.actions.run_and_verify_svn2([], expected_error, 1,
'cat', iota_path)
# Put an unversioned file at 'iota' and try to cat it again, the result
# should still be the same.
svntest.main.file_write(iota_path, "This the unversioned file 'iota'.\n")
- svntest.actions.run_and_verify_svn2(None, [], expected_error, 1,
+ svntest.actions.run_and_verify_svn2([], expected_error, 1,
'cat', iota_path)
def cat_keywords(sbox):
@@ -211,20 +210,18 @@ def cat_keywords(sbox):
wc_dir = sbox.wc_dir
iota_path = os.path.join(wc_dir, 'iota')
- svntest.actions.run_and_verify_svn(None,
- ["This is the file 'iota'.\n"],
+ svntest.actions.run_and_verify_svn(["This is the file 'iota'.\n"],
[], 'cat', iota_path)
svntest.main.file_append(iota_path, "$Revision$\n")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'propset', 'svn:keywords', 'Revision',
iota_path)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'r2', wc_dir)
- svntest.actions.run_and_verify_svn(None,
- ["This is the file 'iota'.\n", "$Revision: 2 $\n"],
+ svntest.actions.run_and_verify_svn(["This is the file 'iota'.\n", "$Revision: 2 $\n"],
[], 'cat', iota_path)
def cat_url_special_characters(sbox):
@@ -239,7 +236,7 @@ def cat_url_special_characters(sbox):
"' refers to a directory\n.*"
for url in special_urls:
- svntest.actions.run_and_verify_svn2(None, None, expected_err, 1,
+ svntest.actions.run_and_verify_svn2(None, expected_err, 1,
'cat', url)
def cat_non_existing_remote_file(sbox):
@@ -251,7 +248,7 @@ def cat_non_existing_remote_file(sbox):
non_existing_path.split('/')[1]
# cat operation on non-existing remote path should return 1
- svntest.actions.run_and_verify_svn2(None, None, expected_err, 1,
+ svntest.actions.run_and_verify_svn2(None, expected_err, 1,
'cat', non_existing_path)
########################################################################
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/changelist_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/changelist_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/changelist_tests.py Mon Feb 9 16:46:16 2015
@@ -930,23 +930,23 @@ def tree_conflicts_and_changelists_on_co
expected_output = svntest.verify.RegexOutput(
"Deleting.*" + re.escape(C),
False)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'commit', '-m', 'delete A/C', C)
expected_output = svntest.verify.RegexOutput(
"A.*" + re.escape(C), False)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'update', C, "-r1")
expected_output = svntest.verify.RegexOutput(
".*'propname' set on '"
+ re.escape(C) + "'", False)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'propset', 'propname', 'propval', C)
expected_output = svntest.verify.RegexOutput(
" C " + re.escape(C), False)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'update', wc_dir)
@@ -1031,7 +1031,7 @@ def move_added_keeps_changelist(sbox):
svntest.main.run_svn(None, "rename", kappa_path, kappa2_path)
# kappa not under version control
- svntest.actions.run_and_verify_svnversion(None, kappa_path, repo_url,
+ svntest.actions.run_and_verify_svnversion(kappa_path, repo_url,
[], ".*doesn't exist.*")
# kappa2 in a changelist
expected_infos = [
@@ -1054,17 +1054,17 @@ def change_to_dir(sbox):
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu visible in changelist
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'changelist', 'qq', sbox.ospath('A/mu'))
expected_infos = [{'Name' : 'mu', 'Changelist' : 'qq'}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu still visible after delete
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', sbox.ospath('A/mu'))
+ svntest.actions.run_and_verify_svn(None, [], 'rm', sbox.ospath('A/mu'))
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu removed from changelist after replace with directory
- svntest.actions.run_and_verify_svn(None, '^A|' + _re_cl_rem_pattern, [],
+ svntest.actions.run_and_verify_svn('^A|' + _re_cl_rem_pattern, [],
'mkdir', sbox.ospath('A/mu'))
expected_infos = [{'Changelist' : None}] # No Name for directories?
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
@@ -1078,7 +1078,7 @@ def change_to_dir(sbox):
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu visible in changelist
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'changelist', 'qq', sbox.ospath('A/mu'))
expected_infos = [{'Name' : 'mu', 'Changelist' : 'qq'}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
@@ -1101,26 +1101,26 @@ def revert_deleted_in_changelist(sbox):
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu visible in changelist
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'changelist', 'qq', sbox.ospath('A/mu'))
expected_infos = [{'Name' : 'mu', 'Changelist' : 'qq'}]
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu still visible after delete
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', sbox.ospath('A/mu'))
+ svntest.actions.run_and_verify_svn(None, [], 'rm', sbox.ospath('A/mu'))
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu still visible after revert
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', sbox.ospath('A/mu'))
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu still visible after parent delete
- svntest.actions.run_and_verify_svn(None, None, [], 'rm', sbox.ospath('A'))
+ svntest.actions.run_and_verify_svn(None, [], 'rm', sbox.ospath('A'))
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
# A/mu still visible after revert
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'revert', '-R', sbox.ospath('A'))
svntest.actions.run_and_verify_info(expected_infos, sbox.ospath('A/mu'))
@@ -1135,11 +1135,11 @@ def add_remove_non_existent_target(sbox)
re.escape(os.path.abspath(bogus_path)) + \
"' was not found"
- svntest.actions.run_and_verify_svn(None, None, expected_err,
+ svntest.actions.run_and_verify_svn(None, expected_err,
'changelist', 'testlist',
bogus_path)
- svntest.actions.run_and_verify_svn(None, None, expected_err,
+ svntest.actions.run_and_verify_svn(None, expected_err,
'changelist', bogus_path,
'--remove')
@@ -1154,11 +1154,11 @@ def add_remove_unversioned_target(sbox):
re.escape(os.path.abspath(unversioned)) + \
"' was not found"
- svntest.actions.run_and_verify_svn(None, None, expected_err,
+ svntest.actions.run_and_verify_svn(None, expected_err,
'changelist', 'testlist',
unversioned)
- svntest.actions.run_and_verify_svn(None, None, expected_err,
+ svntest.actions.run_and_verify_svn(None, expected_err,
'changelist', unversioned,
'--remove')
@@ -1171,7 +1171,7 @@ def readd_after_revert(sbox):
svntest.main.file_write(dummy, "dummy contents")
sbox.simple_add('dummy')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'changelist', 'testlist',
dummy)
@@ -1179,7 +1179,7 @@ def readd_after_revert(sbox):
svntest.main.file_write(dummy, "dummy contents")
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'add', dummy)
Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/checkout_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/checkout_tests.py?rev=1658462&r1=1658461&r2=1658462&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/branches/move-tracking-2/subversion/tests/cmdline/checkout_tests.py Mon Feb 9 16:46:16 2015
@@ -462,14 +462,12 @@ def forced_checkout_with_versioned_obstr
os.mkdir(other_wc_dir)
# Checkout "A" from the first repos to a fresh dir.
- svntest.actions.run_and_verify_svn("Unexpected error during co",
- svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
"co", repo_url + "/A",
fresh_wc_dir_A)
# Checkout "A" from the second repos to the other dir.
- svntest.actions.run_and_verify_svn("Unexpected error during co",
- svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
"co", other_repo_url + "/A",
other_wc_dir_A)
@@ -499,10 +497,10 @@ def forced_checkout_with_versioned_obstr
'--force')
#ensure that other_wc_dir_A is not affected by this forced checkout.
- svntest.actions.run_and_verify_svn("empty status output", None,
+ svntest.actions.run_and_verify_svn(None,
[], "st", other_wc_dir_A)
exit_code, sout, serr = svntest.actions.run_and_verify_svn(
- "it should still point to other_repo_url/A", None, [], "info",
+ None, [], "info",
other_wc_dir_A)
#TODO rename test_stderr to test_regex or something.
@@ -511,7 +509,7 @@ def forced_checkout_with_versioned_obstr
#ensure that other_wc_dir is in a consistent state though it may be
#missing few items.
exit_code, sout, serr = svntest.actions.run_and_verify_svn(
- "it should still point to other_repo_url", None, [], "info",
+ None, [], "info",
other_wc_dir)
#TODO rename test_stderr to test_regex or something.
test_stderr("URL: " + sbox.repo_url + '$', sout)
@@ -544,7 +542,7 @@ def import_and_checkout(sbox):
# Import import_from_dir to the other repos
expected_output = svntest.wc.State(sbox.wc_dir, {})
- svntest.actions.run_and_verify_svn(None, None, [], 'import',
+ svntest.actions.run_and_verify_svn(None, [], 'import',
'-m', 'import', import_from_dir,
other_repo_url)
@@ -633,7 +631,7 @@ def checkout_peg_rev(sbox):
mu_path = os.path.join(wc_dir, 'A', 'mu')
svntest.main.file_append(mu_path, 'appended mu text')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'changed file mu', wc_dir)
# now checkout the repo@1 in another folder, this should create our initial
@@ -688,7 +686,7 @@ def checkout_peg_rev_date(sbox):
mu_path = os.path.join(wc_dir, 'A', 'mu')
svntest.main.file_append(mu_path, 'appended mu text')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'ci', '-m', 'changed file mu', wc_dir)
# now checkout the repo@peg_string in another folder, this should create our
@@ -911,7 +909,7 @@ def co_with_obstructing_local_adds(sbox)
# URL to URL copy of A/D/G to A/D/M.
G_URL = sbox.repo_url + '/A/D/G'
M_URL = sbox.repo_url + '/A/D/M'
- svntest.actions.run_and_verify_svn("Copy error:", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', G_URL, M_URL, '-m', '')
# WC to WC copy of A/D/H to A/D/M. (M is now scheduled for addition
@@ -920,13 +918,13 @@ def co_with_obstructing_local_adds(sbox)
H_path = os.path.join(wc_dir, 'A', 'D', 'H')
M_path = os.path.join(wc_dir, 'A', 'D', 'M')
- svntest.actions.run_and_verify_svn("Copy error:", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', H_path, M_path)
# URL to URL copy of A/B/E/alpha to A/B/F/omicron.
omega_URL = sbox.repo_url + '/A/B/E/alpha'
omicron_URL = sbox.repo_url + '/A/B/F/omicron'
- svntest.actions.run_and_verify_svn("Copy error:", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', omega_URL, omicron_URL,
'-m', '')
@@ -937,7 +935,7 @@ def co_with_obstructing_local_adds(sbox)
omicron_path = os.path.join(wc_dir, 'A', 'B', 'F', 'omicron')
chi_path = os.path.join(wc_dir, 'A', 'D', 'H', 'chi')
- svntest.actions.run_and_verify_svn("Copy error:", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', chi_path,
omicron_path)