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 15:27:51 UTC
svn commit: r1658410 [13/16] - in
/subversion/trunk/subversion/tests/cmdline: ./ svntest/
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1658410&r1=1658409&r2=1658410&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Mon Feb 9 14:27:49 2015
@@ -66,7 +66,7 @@ def status_unversioned_file_in_current_d
svntest.main.file_append('foo', 'a new file')
- svntest.actions.run_and_verify_svn(None, [ "? foo\n" ], [],
+ svntest.actions.run_and_verify_svn([ "? foo\n" ], [],
'stat', 'foo')
#----------------------------------------------------------------------
@@ -136,7 +136,7 @@ def status_shows_all_in_current_dir(sbox
wc_dir = sbox.wc_dir
os.chdir(wc_dir)
- exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
'stat', '-vN')
if (len(output) != len(os.listdir("."))):
@@ -155,14 +155,14 @@ def status_missing_file(sbox):
os.remove('iota')
- exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
'status')
for line in output:
if not re.match("! +iota", line):
raise svntest.Failure
# This invocation is for issue #2127.
- exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
'status', '-u',
'iota')
found_it = 0
@@ -213,7 +213,7 @@ def status_type_change(sbox):
expected_output = [s.replace('/', os.path.sep) for s in expected_output]
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected_output),
[], 'status')
# Now change the file that is obstructing the versioned dir into an
@@ -247,7 +247,7 @@ def status_type_change(sbox):
# Fix separator for Windows
expected_output = [s.replace('/', os.path.sep) for s in expected_output]
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected_output),
[], 'status')
# Now change the versioned dir that is obstructing the file into an
@@ -255,7 +255,7 @@ def status_type_change(sbox):
svntest.main.safe_rmtree('iota')
os.mkdir('iota')
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected_output),
[], 'status')
#----------------------------------------------------------------------
@@ -288,7 +288,7 @@ def status_type_change_to_symlink(sbox):
'~ iota\n',
]
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected_output),
[], 'status')
# "valid" symlinks
@@ -297,7 +297,7 @@ def status_type_change_to_symlink(sbox):
os.symlink('A/mu', 'iota')
os.symlink('C', 'A/D')
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected_output),
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected_output),
[], 'status')
#----------------------------------------------------------------------
@@ -318,7 +318,7 @@ def status_with_new_files_pending(sbox):
svntest.main.run_svn(None,
'up', '-r', '1')
- exit_code, output, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, output, err = svntest.actions.run_and_verify_svn(None, [],
'status', '-u')
# The bug fixed in revision 3686 was a segmentation fault.
@@ -353,8 +353,7 @@ def status_for_unignored_file(sbox):
['I newdir\n',
'I newfile\n',
' M .\n'])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
'status', '--no-ignore', '.')
@@ -362,8 +361,7 @@ def status_for_unignored_file(sbox):
expected = svntest.verify.UnorderedOutput(
['I newdir\n',
'I newfile\n'])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
'status', 'newdir', 'newfile')
@@ -379,7 +377,7 @@ def status_for_nonexistent_file(sbox):
os.chdir(wc_dir)
exit_code, output, err = svntest.actions.run_and_verify_svn(
- None, None, [], 'status', 'nonexistent-file')
+ None, [], 'status', 'nonexistent-file')
# there should *not* be a status line printed for the nonexistent file
for line in output:
@@ -403,10 +401,10 @@ def status_nonrecursive_update_different
J_url = sbox.repo_url + '/A/C/J'
K_path = os.path.join(wc_dir, 'A', 'C', 'K' )
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'rev 2', J_url)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', K_path)
os.chdir(wc_dir)
@@ -418,8 +416,7 @@ def status_nonrecursive_update_different
'Status against revision: 2\n' ]
os.chdir('A')
- svntest.actions.run_and_verify_svn(None,
- UnorderedOutput(expected_output),
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected_output),
[],
'status', '-v', '-N', '-u', 'C')
@@ -430,8 +427,7 @@ def status_nonrecursive_update_different
'Status against revision: 2\n']
os.chdir('C')
- svntest.actions.run_and_verify_svn(None,
- UnorderedOutput(expected_output),
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected_output),
[],
'status', '-v', '-N', '-u', '.')
@@ -494,7 +490,7 @@ def status_file_needs_update(sbox):
# the -v flag, which we don't want, as this bug never appeared when
# -v was passed. So we run status by hand:
os.chdir(was_cwd)
- exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
'status', '-u',
other_wc)
@@ -558,7 +554,7 @@ def status_uninvited_parent_directory(sb
# the bug is present). So run status by hand:
os.chdir(was_cwd)
exit_code, out, err = svntest.actions.run_and_verify_svn(
- None, None, [],
+ None, [],
'status', '-u', os.path.join(other_wc, 'newfile'))
for line in out:
@@ -592,7 +588,7 @@ def status_on_forward_deletion(sbox):
# svn: Working copy not locked
# svn: directory '' not locked
#
- svntest.actions.run_and_verify_svn(None, None, [], 'st', '-u', 'wc')
+ svntest.actions.run_and_verify_svn(None, [], 'st', '-u', 'wc')
# Try again another way; the error would look like this:
#
@@ -607,13 +603,13 @@ def status_on_forward_deletion(sbox):
svntest.main.safe_rmtree('wc')
svntest.main.run_svn(None,
'co', '-r1', A_url + "@1", 'wc')
- svntest.actions.run_and_verify_svn(None, None, [], 'st', '-u', 'wc')
+ svntest.actions.run_and_verify_svn(None, [], 'st', '-u', 'wc')
#----------------------------------------------------------------------
def get_last_changed_date(path):
"get the Last Changed Date for path using svn info"
- exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
'info', path)
for line in out:
if re.match("^Last Changed Date", line):
@@ -624,7 +620,7 @@ def get_last_changed_date(path):
# Helper for timestamp_behaviour test
def get_text_timestamp(path):
"get the text-time for path using svn info"
- exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
'info', path)
for line in out:
if re.match("^Text Last Updated", line):
@@ -634,7 +630,7 @@ def get_text_timestamp(path):
def no_text_timestamp(path):
"ensure no text-time for path using svn info"
- exit_code, out, err = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, out, err = svntest.actions.run_and_verify_svn(None, [],
'info', path)
for line in out:
if re.match("^Text Last Updated", line):
@@ -670,9 +666,9 @@ def text_time_behaviour(wc_dir, wc_path,
# revert/cleanup change the text-time even though the text doesn't change
if cmd == 'cleanup':
- svntest.actions.run_and_verify_svn(None, None, [], cmd, wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], cmd, wc_dir)
else:
- svntest.actions.run_and_verify_svn(None, None, [], cmd, wc_path)
+ svntest.actions.run_and_verify_svn(None, [], cmd, wc_path)
svntest.actions.run_and_verify_status(wc_dir, expected_status)
text_time = get_text_timestamp(wc_path)
if text_time == pre_text_time:
@@ -718,7 +714,7 @@ use-commit-times = yes
svntest.main.create_config_dir(config_dir, config_contents)
other_wc = sbox.add_wc_path('other')
- svntest.actions.run_and_verify_svn("checkout failed", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'co', sbox.repo_url,
other_wc,
'--config-dir', config_dir)
@@ -794,7 +790,7 @@ def status_on_unversioned_dotdot(sbox):
os.mkdir(new_subsub)
os.chdir(new_subsub)
- svntest.actions.run_and_verify_svn2(None, None,
+ svntest.actions.run_and_verify_svn2(None,
"svn: warning: W155(010|007):.*'.*'.*not",
0, 'st', '..')
@@ -868,7 +864,7 @@ def missing_dir_in_anchor(sbox):
wc_dir = sbox.wc_dir
foo_path = sbox.ospath('foo')
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir', foo_path)
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir', foo_path)
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.add({
'foo' : Item(status='A ', wc_rev=0),
@@ -894,7 +890,7 @@ def status_in_xml(sbox):
# Retrieve last changed date from svn log
exit_code, output, error = svntest.actions.run_and_verify_svn(
- None, None, [], 'log', file_path, '--xml', '-rHEAD')
+ None, [], 'log', file_path, '--xml', '-rHEAD')
info_msg = "<date>"
for line in output:
@@ -912,7 +908,7 @@ def status_in_xml(sbox):
svntest.actions.run_and_verify_status_xml(expected_entries, file_path, '-u')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'cp', '-m', 'repo-to-repo copy',
sbox.repo_url + '/iota',
sbox.repo_url + '/iota2')
@@ -926,7 +922,7 @@ def status_in_xml(sbox):
svntest.actions.run_and_verify_status_xml(expected_entries, file_path, '-u')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', '-m', 'repo delete',
sbox.repo_url + '/A/B/E/alpha')
@@ -951,8 +947,7 @@ def status_ignored_dir(sbox):
new_dir = sbox.ospath('dir.o')
new_dir_url = sbox.repo_url + "/dir.o"
- svntest.actions.run_and_verify_svn("Create dir",
- ["Committing transaction...\n",
+ svntest.actions.run_and_verify_svn(["Committing transaction...\n",
"Committed revision 2.\n"], [],
'mkdir', new_dir_url, '-m', 'msg')
@@ -960,8 +955,7 @@ def status_ignored_dir(sbox):
os.mkdir(new_dir)
# run_and_verify_status doesn't handle this weird kind of entry.
- svntest.actions.run_and_verify_svn(None,
- ['I * ' + new_dir + "\n",
+ svntest.actions.run_and_verify_svn(['I * ' + new_dir + "\n",
' * 1 ' + wc_dir + "\n",
'Status against revision: 2\n'], [],
"status", "-u", wc_dir)
@@ -979,7 +973,7 @@ def status_unversioned_dir_in_wc(sbox):
expected_err = "svn: warning: (W155007|W155010): .*'.*(/|\\\\)" + \
os.path.basename(path) + \
"' was not found"
- svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
+ svntest.actions.run_and_verify_svn2([], expected_err, 0,
"status", path)
#----------------------------------------------------------------------
@@ -1002,7 +996,7 @@ def status_missing_dir(sbox):
expected = [ s.replace('A/D/G', a_d_g).replace('/', os.path.sep)
for s in expected ]
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected), [],
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected), [],
"status", wc_dir)
expected = [
@@ -1014,7 +1008,7 @@ def status_missing_dir(sbox):
]
# now run status -u, we should be able to do this without crashing
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected), [],
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected), [],
"status", "-u", wc_dir)
# Finally run an explicit status request directly on the missing directory.
@@ -1027,7 +1021,7 @@ def status_missing_dir(sbox):
expected = [ s.replace('A/D/G', a_d_g).replace('/', os.path.sep)
for s in expected ]
- svntest.actions.run_and_verify_svn(None, UnorderedOutput(expected), [],
+ svntest.actions.run_and_verify_svn(UnorderedOutput(expected), [],
"status", a_d_g)
def status_add_plus_conflict(sbox):
@@ -1040,42 +1034,42 @@ def status_add_plus_conflict(sbox):
branch_url = sbox.repo_url + '/branch'
trunk_url = sbox.repo_url + '/trunk'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'rev 2',
branch_url, trunk_url)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'update', wc_dir)
branch_file = sbox.ospath('branch/file')
svntest.main.file_write(branch_file, "line 1\nline2\nline3\n", 'wb+')
- svntest.actions.run_and_verify_svn(None, None, [], 'add', branch_file)
+ svntest.actions.run_and_verify_svn(None, [], 'add', branch_file)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'commit',
branch_file, '-m', 'rev 3')
svntest.main.file_write(branch_file, "line 1\nline3\n", 'wb')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'commit',
branch_file, '-m', 'rev 4')
svntest.main.file_write(branch_file, "line 1\nline2\n", 'wb')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'commit',
branch_file, '-m', 'rev 5')
trunk_dir = sbox.ospath('trunk')
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'merge',
branch_url, '-r', '2:3', trunk_dir)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'merge',
branch_url, '-r', '4:5', trunk_dir)
@@ -1090,7 +1084,7 @@ def status_add_plus_conflict(sbox):
expected_output = svntest.verify.UnorderedOutput(lines)
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'status', wc_dir)
#----------------------------------------------------------------------
@@ -1104,8 +1098,7 @@ def inconsistent_eol(sbox):
svntest.main.file_write(iota_path, "line 1\nline 2\n", "wb")
- svntest.actions.run_and_verify_svn(None,
- "property 'svn:eol-style' set on.*iota",
+ svntest.actions.run_and_verify_svn("property 'svn:eol-style' set on.*iota",
[],
'propset', 'svn:eol-style', 'native',
sbox.ospath('iota'))
@@ -1177,8 +1170,7 @@ def status_update_with_incoming_props(sb
" * 1 " + wc_dir + "\n",
"Status against revision: 2\n" ])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u",
wc_dir)
@@ -1190,12 +1182,12 @@ def status_update_with_incoming_props(sb
" * 1 1 jrandom " + wc_dir + "\n",
"Status against revision: 2\n" ])
- svntest.actions.run_and_verify_svn(None, expected, [],
+ svntest.actions.run_and_verify_svn(expected, [],
"status", "-uvN",
wc_dir)
# Retrieve last changed date from svn log
- exit_code, output, error = svntest.actions.run_and_verify_svn(None, None, [],
+ exit_code, output, error = svntest.actions.run_and_verify_svn(None, [],
'log', wc_dir,
'--xml', '-r1')
@@ -1303,8 +1295,7 @@ def status_update_verbose_with_incoming_
" *" + common + wc_dir + "\n",
"Status against revision: 2\n" ])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-uv", wc_dir)
@@ -1358,8 +1349,7 @@ def status_nonrecursive_update(sbox):
xout = [" * 1 " + sbox.ospath('A/mu') + "\n",
"Status against revision: 2\n" ]
- svntest.actions.run_and_verify_svn(None,
- xout,
+ svntest.actions.run_and_verify_svn(xout,
[],
"status", "-uN", A_path)
@@ -1416,8 +1406,7 @@ def status_depth_local(sbox):
# depth=empty
expected = svntest.verify.UnorderedOutput(
[" M %s\n" % A_path])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "--depth=empty", A_path)
@@ -1426,8 +1415,7 @@ def status_depth_local(sbox):
[" M %s\n" % A_path,
"M %s\n" % mu_path])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "--depth=files", A_path)
@@ -1437,8 +1425,7 @@ def status_depth_local(sbox):
" M %s\n" % D_path,
"M %s\n" % mu_path])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "--depth=immediates", A_path)
@@ -1449,8 +1436,7 @@ def status_depth_local(sbox):
"M %s\n" % mu_path,
"M %s\n" % gamma_path])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "--depth=infinity", A_path)
@@ -1482,8 +1468,7 @@ def status_depth_update(sbox):
[" * 1 %s\n" % A_path,
"Status against revision: 3\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=empty", A_path)
@@ -1493,8 +1478,7 @@ def status_depth_update(sbox):
" * 1 %s\n" % A_path,
"Status against revision: 3\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=files",
A_path)
@@ -1506,8 +1490,7 @@ def status_depth_update(sbox):
" * 1 %s\n" % mu_path,
"Status against revision: 3\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=immediates",
A_path)
@@ -1520,8 +1503,7 @@ def status_depth_update(sbox):
" * 1 %s\n" % gamma_path,
"Status against revision: 3\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=infinity",
A_path)
@@ -1550,8 +1532,7 @@ def status_depth_update_local_modificati
[" M 1 %s\n" % A_path,
"Status against revision: 1\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=empty", A_path)
@@ -1559,8 +1540,7 @@ def status_depth_update_local_modificati
["M 1 %s\n" % mu_path,
"Status against revision: 1\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=empty", mu_path)
@@ -1570,8 +1550,7 @@ def status_depth_update_local_modificati
" M 1 %s\n" % A_path,
"Status against revision: 1\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=files",
A_path)
@@ -1583,8 +1562,7 @@ def status_depth_update_local_modificati
"M 1 %s\n" % mu_path,
"Status against revision: 1\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=immediates",
A_path)
@@ -1597,8 +1575,7 @@ def status_depth_update_local_modificati
"M 1 %s\n" % gamma_path,
"Status against revision: 1\n"])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "--depth=infinity",
A_path)
@@ -1615,7 +1592,7 @@ def status_dash_u_deleted_directories(sb
B_path = os.path.join(A_path, 'B')
# delete the B directory
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'rm', B_path)
# now run status -u on B and its children
@@ -1632,8 +1609,7 @@ def status_dash_u_deleted_directories(sb
"D 1 %s\n" % os.path.join("B", "E", "beta"),
"D 1 %s\n" % os.path.join("B", "F"),
"Status against revision: 1\n" ])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", "B")
@@ -1649,8 +1625,7 @@ def status_dash_u_deleted_directories(sb
"D 1 %s\n" % os.path.join("E", "beta"),
"D 1 %s\n" % "F",
"Status against revision: 1\n" ])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u", ".")
@@ -1663,8 +1638,7 @@ def status_dash_u_deleted_directories(sb
os.chdir(was_cwd)
os.chdir(A_path)
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u",
os.path.join("B", "E"))
@@ -1689,8 +1663,7 @@ def status_dash_u_type_change(sbox):
xout = ["~ 1 iota\n",
"Status against revision: 1\n" ]
- svntest.actions.run_and_verify_svn(None,
- xout,
+ svntest.actions.run_and_verify_svn(xout,
[],
"status", "-u")
@@ -1725,8 +1698,7 @@ def status_dash_u_type_change(sbox):
[s.replace('/', os.path.sep)
for s in output])
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-u")
@@ -1756,8 +1728,7 @@ def status_with_tree_conflicts(sbox):
" > local file delete, incoming file delete or move upon update\n",
] + svntest.main.summary_of_conflicts(tree_conflicts=3))
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", G)
@@ -1772,8 +1743,7 @@ def status_with_tree_conflicts(sbox):
" > local file delete, incoming file delete or move upon update\n",
] + svntest.main.summary_of_conflicts(tree_conflicts=3))
- svntest.actions.run_and_verify_svn(None,
- expected,
+ svntest.actions.run_and_verify_svn(expected,
[],
"status", "-v", G)
@@ -1831,7 +1801,7 @@ def status_nested_wc_old_format(sbox):
svntest.main.file_append(sbox.ospath('subdir/.svn/format'),
'10\n') # format 10 was the Subversion 1.6 format
os.chdir(wc_dir)
- svntest.actions.run_and_verify_svn(None, [ "? subdir\n" ], [], 'st')
+ svntest.actions.run_and_verify_svn([ "? subdir\n" ], [], 'st')
#----------------------------------------------------------------------
# Regression test for issue #3855 "status doesn't show 'K' on a locked
@@ -1844,9 +1814,9 @@ def status_locked_deleted(sbox):
iota_path = sbox.ospath('iota')
sbox.simple_rm('iota')
- svntest.actions.run_and_verify_svn(None, None, [], 'lock',
+ svntest.actions.run_and_verify_svn(None, [], 'lock',
os.path.join(sbox.wc_dir, 'iota'))
- svntest.actions.run_and_verify_svn(None, ['D K %s\n' % iota_path], [],
+ svntest.actions.run_and_verify_svn(['D K %s\n' % iota_path], [],
'status', iota_path)
@Issue(3774)
@@ -1858,7 +1828,7 @@ def wc_wc_copy_timestamp(sbox):
time.sleep(1.1)
svntest.main.file_append(sbox.ospath('A/D/H/psi'), 'modified\n')
- svntest.actions.run_and_verify_svn(None, None, [], 'copy',
+ svntest.actions.run_and_verify_svn(None, [], 'copy',
sbox.ospath('A/D/H'),
sbox.ospath('A/D/H2'))
@@ -1889,7 +1859,7 @@ def wc_wc_copy_timestamp(sbox):
raise svntest.Failure("psi timestamps should be the same")
# Cleanup repairs timestamps, so this should be a no-op.
- svntest.actions.run_and_verify_svn(None, None, [], 'cleanup', wc_dir)
+ svntest.actions.run_and_verify_svn(None, [], 'cleanup', wc_dir)
chi_dst_timestamp2 = get_text_timestamp(sbox.ospath('A/D/H2/chi'))
if chi_dst_timestamp2 != chi_dst_timestamp1:
raise svntest.Failure("chi timestamps should be the same")
@@ -1917,7 +1887,7 @@ def wclock_status(sbox):
'A/D/G',
'A/D/H']
])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'status', wc_dir)
# Second non-recursive lock
@@ -1931,7 +1901,7 @@ def wclock_status(sbox):
'A/D/G',
'A/D/H']
])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'status', wc_dir)
@@ -1953,12 +1923,12 @@ def modified_modulo_translation(sbox):
# Run status. Expect some output.
# TODO: decide how such files should show in the output; whether they
# always show, or only with some --flag; and adjust this accordingly.
- svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
'status', wc_dir)
# Expect the file to be renormalized (to LF) after a revert.
sbox.simple_revert('iota')
- svntest.actions.run_and_verify_svn(None, [], [], 'status', wc_dir)
+ svntest.actions.run_and_verify_svn([], [], 'status', wc_dir)
def status_not_present(sbox):
"no status on not-present and excluded nodes"
@@ -1972,7 +1942,7 @@ def status_not_present(sbox):
sbox.ospath('A/mu'), sbox.ospath('A/B'))
sbox.simple_commit()
- svntest.actions.run_and_verify_svn(None, [], [],'status',
+ svntest.actions.run_and_verify_svn([], [],'status',
sbox.ospath('iota'),
sbox.ospath('A/B'),
sbox.ospath('A/C'),
@@ -1989,7 +1959,7 @@ def status_unversioned_dir(sbox):
# This should work on UNIX-like systems and Windows systems
expected_err = "svn: warning: W1550(07|10): .*'.*(/|\\\\)" + \
"' is not a working copy"
- svntest.actions.run_and_verify_svn2(None, [], expected_err, 0,
+ svntest.actions.run_and_verify_svn2([], expected_err, 0,
"status", "/")
def status_case_changed(sbox):
@@ -2075,7 +2045,7 @@ def move_update_timestamps(sbox):
expected_status)
time.sleep(1.1)
- svntest.actions.run_and_verify_svn("resolve failed", None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'resolve',
'--accept=mine-conflict',
sbox.ospath('A/B/E'))
@@ -2149,7 +2119,7 @@ def status_move_missing_direct(sbox):
'D + %s\n' % sbox.ospath('ZB/E'),
' > moved to %s\n' % os.path.join('..', 'Z', 'B', 'E'),
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ svntest.actions.run_and_verify_svn(expected_output, [], 'status',
sbox.ospath('ZB'), '--depth', 'immediates')
# And calling svn status on just 'ZB/E' should have the same result for this node
@@ -2158,7 +2128,7 @@ def status_move_missing_direct(sbox):
'D + %s\n' % sbox.ospath('ZB/E'),
' > moved to %s\n' % os.path.join('..', '..', 'Z', 'B', 'E'),
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ svntest.actions.run_and_verify_svn(expected_output, [], 'status',
sbox.ospath('ZB/E'), '--depth', 'empty')
def status_move_missing_direct_base(sbox):
@@ -2198,7 +2168,7 @@ def status_move_missing_direct_base(sbox
'D + %s\n' % sbox.ospath('Q/ZB/E'),
' > moved to %s\n' % os.path.join('..', '..', 'Z', 'B', 'E'),
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ svntest.actions.run_and_verify_svn(expected_output, [], 'status',
sbox.ospath('Q/ZB'), '--depth', 'immediates')
# And calling svn status on just 'ZB/E' should have the same result for this node,
@@ -2207,7 +2177,7 @@ def status_move_missing_direct_base(sbox
'D + %s\n' % sbox.ospath('Q/ZB/E'),
' > moved to %s\n' % os.path.join('..', '..', '..', 'Z', 'B', 'E'),
]
- svntest.actions.run_and_verify_svn(None, expected_output, [], 'status',
+ svntest.actions.run_and_verify_svn(expected_output, [], 'status',
sbox.ospath('Q/ZB/E'), '--depth', 'empty')
########################################################################
Modified: subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py?rev=1658410&r1=1658409&r2=1658410&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py Mon Feb 9 14:27:49 2015
@@ -277,8 +277,7 @@ def load_and_verify_dumpstream(sbox, exp
if revs:
# verify revs as wc states
for rev in range(len(revs)):
- svntest.actions.run_and_verify_svn("Updating to r%s" % (rev+1),
- svntest.verify.AnyOutput, [],
+ svntest.actions.run_and_verify_svn(svntest.verify.AnyOutput, [],
"update", "-r%s" % (rev+1),
sbox.wc_dir)
@@ -520,7 +519,7 @@ def empty_date(sbox):
'--ignore-uuid')
# Verify that the revision still lacks the svn:date property.
- svntest.actions.run_and_verify_svn(None, [], '.*(E195011|E200017).*svn:date',
+ svntest.actions.run_and_verify_svn([], '.*(E195011|E200017).*svn:date',
"propget", "--revprop", "-r1", "svn:date",
sbox.wc_dir)
@@ -600,7 +599,7 @@ def hotcopy_dot(sbox):
os.chdir(backup_dir)
svntest.actions.run_and_verify_svnadmin(
- None, None, [],
+ None, [],
"hotcopy", os.path.join(cwd, sbox.repo_dir), '.')
os.chdir(cwd)
@@ -651,7 +650,7 @@ def setrevprop(sbox):
# Try a simple log property modification.
iota_path = os.path.join(sbox.wc_dir, "iota")
mu_path = sbox.ospath('A/mu')
- svntest.actions.run_and_verify_svnadmin(None, [], [],
+ svntest.actions.run_and_verify_svnadmin([], [],
"setlog", sbox.repo_dir, "-r0",
"--bypass-hooks",
iota_path)
@@ -661,14 +660,13 @@ def setrevprop(sbox):
#
# Note that we attempt to set the log message to a different value than the
# successful call.
- svntest.actions.run_and_verify_svnadmin(None, [], svntest.verify.AnyOutput,
+ svntest.actions.run_and_verify_svnadmin([], svntest.verify.AnyOutput,
"setlog", sbox.repo_dir, "-r0",
mu_path)
# Verify that the revprop value matches what we set when retrieved
# through the client.
- svntest.actions.run_and_verify_svn(None,
- [ "This is the file 'iota'.\n", "\n" ],
+ svntest.actions.run_and_verify_svn([ "This is the file 'iota'.\n", "\n" ],
[], "propget", "--revprop", "-r0",
"svn:log", sbox.wc_dir)
@@ -686,15 +684,15 @@ def setrevprop(sbox):
# Verify that the revprop value matches what we set when retrieved
# through the client.
- svntest.actions.run_and_verify_svn(None, [ "foo\n" ], [], "propget",
+ svntest.actions.run_and_verify_svn([ "foo\n" ], [], "propget",
"--revprop", "-r0", "svn:author",
sbox.wc_dir)
# Delete the property.
- svntest.actions.run_and_verify_svnadmin(None, [], [],
+ svntest.actions.run_and_verify_svnadmin([], [],
"delrevprop", "-r0", sbox.repo_dir,
"svn:author")
- svntest.actions.run_and_verify_svnlook(None, [], ".*E200017.*svn:author.*",
+ svntest.actions.run_and_verify_svnlook([], ".*E200017.*svn:author.*",
"propget", "--revprop", "-r0",
sbox.repo_dir, "svn:author")
@@ -706,7 +704,7 @@ def verify_windows_paths_in_repos(sbox):
repo_url = sbox.repo_url
chi_url = sbox.repo_url + '/c:hi'
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'log_msg',
chi_url)
@@ -777,7 +775,7 @@ def verify_incremental_fsfs(sbox):
E_url = sbox.repo_url + '/A/B/E'
# Create A/B/E/bravo in r2.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'log_msg',
E_url + '/bravo')
# Corrupt r2's reference to A/C by replacing "dir 7-1.0.r1/1568" with
@@ -1018,21 +1016,18 @@ def load_with_parent_dir(sbox):
dumpfile = open(dumpfile_location).read()
# Create 'sample' dir in sbox.repo_url, and load the dump stream there.
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 1.\n'],
[], "mkdir", sbox.repo_url + "/sample",
"-m", "Create sample dir")
load_dumpstream(sbox, dumpfile, '--parent-dir', '/sample')
# Verify the svn:mergeinfo properties for '--parent-dir'
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url +
+ svntest.actions.run_and_verify_svn([sbox.repo_url +
"/sample/branch - /sample/trunk:5-7\n"],
[], 'propget', 'svn:mergeinfo', '-R',
sbox.repo_url + '/sample/branch')
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url +
+ svntest.actions.run_and_verify_svn([sbox.repo_url +
"/sample/branch1 - " +
"/sample/branch:6-9\n"],
[], 'propget', 'svn:mergeinfo', '-R',
@@ -1041,22 +1036,19 @@ def load_with_parent_dir(sbox):
# Create 'sample-2' dir in sbox.repo_url, and load the dump stream again.
# This time, don't include a leading slash on the --parent-dir argument.
# See issue #3547.
- svntest.actions.run_and_verify_svn(None,
- ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 11.\n'],
[], "mkdir", sbox.repo_url + "/sample-2",
"-m", "Create sample-2 dir")
load_dumpstream(sbox, dumpfile, '--parent-dir', 'sample-2')
# Verify the svn:mergeinfo properties for '--parent-dir'.
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url +
+ svntest.actions.run_and_verify_svn([sbox.repo_url +
"/sample-2/branch - " +
"/sample-2/trunk:15-17\n"],
[], 'propget', 'svn:mergeinfo', '-R',
sbox.repo_url + '/sample-2/branch')
- svntest.actions.run_and_verify_svn(None,
- [sbox.repo_url +
+ svntest.actions.run_and_verify_svn([sbox.repo_url +
"/sample-2/branch1 - " +
"/sample-2/branch:16-19\n"],
[], 'propget', 'svn:mergeinfo', '-R',
@@ -1076,11 +1068,11 @@ def set_uuid(sbox):
orig_uuid = output[0].rstrip()
# Try setting a new, bogus UUID.
- svntest.actions.run_and_verify_svnadmin(None, None, '^.*Malformed UUID.*$',
+ svntest.actions.run_and_verify_svnadmin(None, '^.*Malformed UUID.*$',
'setuuid', sbox.repo_dir, 'abcdef')
# Try generating a brand new UUID.
- svntest.actions.run_and_verify_svnadmin(None, [], None,
+ svntest.actions.run_and_verify_svnadmin([], None,
'setuuid', sbox.repo_dir)
exit_code, output, errput = svntest.main.run_svnlook('uuid', sbox.repo_dir)
if errput:
@@ -1091,7 +1083,7 @@ def set_uuid(sbox):
raise svntest.Failure
# Now, try setting the UUID back to the original value.
- svntest.actions.run_and_verify_svnadmin(None, [], None,
+ svntest.actions.run_and_verify_svnadmin([], None,
'setuuid', sbox.repo_dir, orig_uuid)
exit_code, output, errput = svntest.main.run_svnlook('uuid', sbox.repo_dir)
if errput:
@@ -1116,7 +1108,7 @@ def reflect_dropped_renumbered_revs(sbox
dumpfile = open(dumpfile_location).read()
# Create 'toplevel' dir in sbox.repo_url
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 1.\n'],
[], "mkdir", sbox.repo_url + "/toplevel",
"-m", "Create toplevel dir")
@@ -1133,7 +1125,7 @@ def reflect_dropped_renumbered_revs(sbox
url + "/trunk - /branch1:5-9\n",
url + "/toplevel/trunk - /toplevel/branch1:14-18\n",
])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:mergeinfo', '-R',
sbox.repo_url)
@@ -1364,7 +1356,7 @@ def dont_drop_valid_mergeinfo_during_inc
url + "B2 - /trunk:9\n",
url + "B1/B/E - /branches/B2/B/E:11-12\n",
"/trunk/B/E:5-6,8-9\n"])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:mergeinfo', '-R',
sbox.repo_url)
@@ -1403,7 +1395,7 @@ def dont_drop_valid_mergeinfo_during_inc
# Check the mergeinfo, we use the same expected output as before,
# as it (duh!) should be exactly the same as when we loaded the
# repos in one shot.
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:mergeinfo', '-R',
sbox.repo_url)
@@ -1457,7 +1449,7 @@ def dont_drop_valid_mergeinfo_during_inc
url + "B2 - /Projects/Project-X/trunk:15\n",
url + "B1/B/E - /Projects/Project-X/branches/B2/B/E:17-18\n",
"/Projects/Project-X/trunk/B/E:11-12,14-15\n"])
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:mergeinfo', '-R',
sbox.repo_url)
@@ -1480,7 +1472,7 @@ def dont_drop_valid_mergeinfo_during_inc
# Check the resulting mergeinfo. We expect the exact same results
# as Part 3.
# See http://subversion.tigris.org/issues/show_bug.cgi?id=3020#desc16.
- svntest.actions.run_and_verify_svn(None, expected_output, [],
+ svntest.actions.run_and_verify_svn(expected_output, [],
'propget', 'svn:mergeinfo', '-R',
sbox.repo_url)
@@ -1530,7 +1522,7 @@ def hotcopy_symlink(sbox):
os.symlink(target_abspath, symlink_path + '_abs')
svntest.actions.run_and_verify_svnadmin(
- None, None, [],
+ None, [],
"hotcopy", original_repo, hotcopy_repo)
# Check if the symlinks were copied correctly.
@@ -1699,7 +1691,7 @@ def test_lslocks_and_rmlocks(sbox):
"'.*iota' locked by user 'jrandom'.\n"])
# Lock iota and A/B/lambda using svn client
- svntest.actions.run_and_verify_svn(None, expected_output,
+ svntest.actions.run_and_verify_svn(expected_output,
[], "lock", "-m", "Locking files",
iota_url, lambda_url)
@@ -1772,13 +1764,13 @@ def load_ranges(sbox):
# Load our dumpfile, 2 revisions at a time, verifying that we have
# the correct youngest revision after each load.
load_dumpstream(sbox, dumpdata, '-r0:2')
- svntest.actions.run_and_verify_svnlook("Unexpected output", ['2\n'],
+ svntest.actions.run_and_verify_svnlook(['2\n'],
None, 'youngest', sbox.repo_dir)
load_dumpstream(sbox, dumpdata, '-r3:4')
- svntest.actions.run_and_verify_svnlook("Unexpected output", ['4\n'],
+ svntest.actions.run_and_verify_svnlook(['4\n'],
None, 'youngest', sbox.repo_dir)
load_dumpstream(sbox, dumpdata, '-r5:6')
- svntest.actions.run_and_verify_svnlook("Unexpected output", ['6\n'],
+ svntest.actions.run_and_verify_svnlook(['6\n'],
None, 'youngest', sbox.repo_dir)
# There are ordering differences in the property blocks.
@@ -1809,7 +1801,7 @@ def hotcopy_incremental(sbox):
for i in [1, 2, 3]:
os.chdir(backup_dir)
svntest.actions.run_and_verify_svnadmin(
- None, None, [],
+ None, [],
"hotcopy", "--incremental", os.path.join(cwd, sbox.repo_dir), '.')
os.chdir(cwd)
@@ -1837,14 +1829,14 @@ def hotcopy_incremental_packed(sbox):
if not (svntest.main.is_fs_type_fsfs and svntest.main.options.fsfs_packing
and svntest.main.options.fsfs_sharding == 2):
svntest.actions.run_and_verify_svnadmin(
- None, ['Packing revisions in shard 0...done.\n'], [], "pack",
+ ['Packing revisions in shard 0...done.\n'], [], "pack",
os.path.join(cwd, sbox.repo_dir))
# Commit 5 more revs, hotcopy and pack after each commit.
for i in [1, 2, 3, 4, 5]:
os.chdir(backup_dir)
svntest.actions.run_and_verify_svnadmin(
- None, None, [],
+ None, [],
"hotcopy", "--incremental", os.path.join(cwd, sbox.repo_dir), '.')
os.chdir(cwd)
@@ -1860,7 +1852,7 @@ def hotcopy_incremental_packed(sbox):
else:
expected_output = []
svntest.actions.run_and_verify_svnadmin(
- None, expected_output, [], "pack", os.path.join(cwd, sbox.repo_dir))
+ expected_output, [], "pack", os.path.join(cwd, sbox.repo_dir))
def locking(sbox):
@@ -1875,7 +1867,7 @@ def locking(sbox):
# Test illegal character in comment file.
expected_error = ".*svnadmin: E130004:.*"
- svntest.actions.run_and_verify_svnadmin(None, None,
+ svntest.actions.run_and_verify_svnadmin(None,
expected_error, "lock",
sbox.repo_dir,
"iota", "jrandom",
@@ -1883,7 +1875,7 @@ def locking(sbox):
# Test locking path with --bypass-hooks
expected_output = "'iota' locked by user 'jrandom'."
- svntest.actions.run_and_verify_svnadmin(None, expected_output,
+ svntest.actions.run_and_verify_svnadmin(expected_output,
None, "lock",
sbox.repo_dir,
"iota", "jrandom",
@@ -1891,13 +1883,13 @@ def locking(sbox):
"--bypass-hooks")
# Remove lock
- svntest.actions.run_and_verify_svnadmin(None, None,
+ svntest.actions.run_and_verify_svnadmin(None,
None, "rmlocks",
sbox.repo_dir, "iota")
# Test locking path without --bypass-hooks
expected_output = "'iota' locked by user 'jrandom'."
- svntest.actions.run_and_verify_svnadmin(None, expected_output,
+ svntest.actions.run_and_verify_svnadmin(expected_output,
None, "lock",
sbox.repo_dir,
"iota", "jrandom",
@@ -1905,7 +1897,7 @@ def locking(sbox):
# Test locking already locked path.
expected_error = ".*svnadmin: E160035:.*"
- svntest.actions.run_and_verify_svnadmin(None, None,
+ svntest.actions.run_and_verify_svnadmin(None,
expected_error, "lock",
sbox.repo_dir,
"iota", "jrandom",
@@ -1913,7 +1905,7 @@ def locking(sbox):
# Test locking non-existent path.
expected_error = ".*svnadmin: E160013:.*"
- svntest.actions.run_and_verify_svnadmin(None, None,
+ svntest.actions.run_and_verify_svnadmin(None,
expected_error, "lock",
sbox.repo_dir,
"non-existent", "jrandom",
@@ -1922,7 +1914,7 @@ def locking(sbox):
# Test locking a path while specifying a lock token.
expected_output = "'A/D/G/rho' locked by user 'jrandom'."
lock_token = "opaquelocktoken:01234567-89ab-cdef-89ab-cdef01234567"
- svntest.actions.run_and_verify_svnadmin(None, expected_output,
+ svntest.actions.run_and_verify_svnadmin(expected_output,
None, "lock",
sbox.repo_dir,
"A/D/G/rho", "jrandom",
@@ -1931,7 +1923,7 @@ def locking(sbox):
# Test unlocking a path, but provide the wrong lock token.
expected_error = ".*svnadmin: E160040:.*"
wrong_lock_token = "opaquelocktoken:12345670-9ab8-defc-9ab8-def01234567c"
- svntest.actions.run_and_verify_svnadmin(None, None,
+ svntest.actions.run_and_verify_svnadmin(None,
expected_error, "unlock",
sbox.repo_dir,
"A/D/G/rho", "jrandom",
@@ -1940,7 +1932,7 @@ def locking(sbox):
# Test unlocking the path again, but this time provide the correct
# lock token.
expected_output = "'A/D/G/rho' unlocked."
- svntest.actions.run_and_verify_svnadmin(None, expected_output,
+ svntest.actions.run_and_verify_svnadmin(expected_output,
None, "unlock",
sbox.repo_dir,
"A/D/G/rho", "jrandom",
@@ -1955,7 +1947,7 @@ def locking(sbox):
# Test locking a path. Don't use --bypass-hooks, though, as we wish
# to verify that hook script is really getting executed.
expected_error = ".*svnadmin: E165001:.*"
- svntest.actions.run_and_verify_svnadmin(None, None,
+ svntest.actions.run_and_verify_svnadmin(None,
expected_error, "lock",
sbox.repo_dir,
"iota", "jrandom",
@@ -1977,7 +1969,7 @@ def locking(sbox):
# Try to unlock a path while providing the correct lock token but
# with a preventative hook in place.
expected_error = ".*svnadmin: E165001:.*"
- svntest.actions.run_and_verify_svnadmin(None, None,
+ svntest.actions.run_and_verify_svnadmin(None,
expected_error, "unlock",
sbox.repo_dir,
"iota", "jrandom",
@@ -1986,7 +1978,7 @@ def locking(sbox):
# Finally, use --bypass-hooks to unlock the path (again using the
# correct lock token).
expected_output = "'iota' unlocked."
- svntest.actions.run_and_verify_svnadmin(None, expected_output,
+ svntest.actions.run_and_verify_svnadmin(expected_output,
None, "unlock",
"--bypass-hooks",
sbox.repo_dir,
@@ -2038,7 +2030,7 @@ def mergeinfo_race(sbox):
def recover_old_empty(sbox):
"recover empty --compatible-version=1.3"
sbox.build(create_wc=False, empty=True, minor_version=3)
- svntest.actions.run_and_verify_svnadmin(None, None, [],
+ svntest.actions.run_and_verify_svnadmin(None, [],
"recover", sbox.repo_dir)
@@ -2052,11 +2044,11 @@ def verify_keep_going(sbox):
C_url = sbox.repo_url + '/C'
# Create A/B/E/bravo in r2.
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'log_msg',
B_url)
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'log_msg',
C_url)
@@ -2125,7 +2117,7 @@ def verify_invalid_path_changes(sbox):
# Create a number of revisions each adding a single path
for r in range(2,20):
- svntest.actions.run_and_verify_svn(None, None, [],
+ svntest.actions.run_and_verify_svn(None, [],
'mkdir', '-m', 'log_msg',
sbox.repo_url + '/B' + str(r))
@@ -2312,7 +2304,7 @@ def fsfs_recover_old_non_empty(sbox):
# svnadmin: E200002: Serialized hash missing terminator
sbox.build(create_wc=False, minor_version=3)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "recover",
+ svntest.actions.run_and_verify_svnadmin(None, [], "recover",
sbox.repo_dir)
@@ -2326,7 +2318,7 @@ def fsfs_hotcopy_old_non_empty(sbox):
sbox.build(create_wc=False, minor_version=3)
backup_dir, backup_url = sbox.add_repo_path('backup')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2346,7 +2338,7 @@ def load_ignore_dates(sbox):
'skeleton_repos.dump')).read()
load_dumpstream(sbox, dumpfile_skeleton, '--ignore-dates')
- svntest.actions.run_and_verify_svnlook("Unexpected output", ['6\n'],
+ svntest.actions.run_and_verify_svnlook(['6\n'],
None, 'youngest', sbox.repo_dir)
for rev in range(1, 6):
exit_code, output, errput = svntest.main.run_svnlook('date', '-r', rev,
@@ -2385,9 +2377,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
# r1 = Initial greek tree sandbox.
backup_dir, backup_url = sbox.add_repo_path('backup-after-r1')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
"--incremental",
sbox.repo_dir, inc_backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2398,9 +2390,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
sbox.simple_commit(message='r2')
backup_dir, backup_url = sbox.add_repo_path('backup-after-r2')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
"--incremental",
sbox.repo_dir, inc_backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2411,9 +2403,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
sbox.simple_commit(message='r3')
backup_dir, backup_url = sbox.add_repo_path('backup-after-r3')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
"--incremental",
sbox.repo_dir, inc_backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2424,9 +2416,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
sbox.simple_commit(message='r4')
backup_dir, backup_url = sbox.add_repo_path('backup-after-r4')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
"--incremental",
sbox.repo_dir, inc_backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2437,9 +2429,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
sbox.simple_commit(message='r5')
backup_dir, backup_url = sbox.add_repo_path('backup-after-r5')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
"--incremental",
sbox.repo_dir, inc_backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2450,9 +2442,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
sbox.simple_commit(message='r6')
backup_dir, backup_url = sbox.add_repo_path('backup-after-r6')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
"--incremental",
sbox.repo_dir, inc_backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2464,9 +2456,9 @@ def fsfs_hotcopy_old_with_id_changes(sbo
sbox.simple_commit(message='r7')
backup_dir, backup_url = sbox.add_repo_path('backup-after-r7')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
"--incremental",
sbox.repo_dir, inc_backup_dir)
check_hotcopy_fsfs(sbox.repo_dir, backup_dir)
@@ -2506,7 +2498,7 @@ def verify_packed(sbox):
expected_output = ["Packing revisions in shard 0...done.\n",
"Packing revisions in shard 1...done.\n",
"Packing revisions in shard 2...done.\n"]
- svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+ svntest.actions.run_and_verify_svnadmin(expected_output, [],
"pack", sbox.repo_dir)
if svntest.main.is_fs_log_addressing():
@@ -2529,7 +2521,7 @@ def verify_packed(sbox):
"* Verified revision 4.\n",
"* Verified revision 5.\n"]
- svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+ svntest.actions.run_and_verify_svnadmin(expected_output, [],
"verify", sbox.repo_dir)
# Test that 'svnadmin freeze' is nestable. (For example, this ensures it
@@ -2544,7 +2536,7 @@ def freeze_freeze(sbox):
sbox.build(create_wc=False, read_only=True)
second_repo_dir, _ = sbox.add_repo_path('backup')
- svntest.actions.run_and_verify_svnadmin(None, None, [], "hotcopy",
+ svntest.actions.run_and_verify_svnadmin(None, [], "hotcopy",
sbox.repo_dir, second_repo_dir)
if svntest.main.is_fs_type_fsx() or \
@@ -2556,10 +2548,10 @@ def freeze_freeze(sbox):
# for new FS formats, but in order to avoid a deadlock for old formats,
# we have to manually assign a new UUID for the hotcopy destination.
# As of trunk@1618024, the same applies to FSX repositories.
- svntest.actions.run_and_verify_svnadmin(None, [], None,
+ svntest.actions.run_and_verify_svnadmin([], None,
'setuuid', second_repo_dir)
- svntest.actions.run_and_verify_svnadmin(None, None, [],
+ svntest.actions.run_and_verify_svnadmin(None, [],
'freeze', '--', sbox.repo_dir,
svntest.main.svnadmin_binary, 'freeze', '--', second_repo_dir,
sys.executable, '-c', 'True')
@@ -2568,7 +2560,7 @@ def freeze_freeze(sbox):
svntest.main.file_write(arg_file,
"%s\n%s\n" % (sbox.repo_dir, second_repo_dir))
- svntest.actions.run_and_verify_svnadmin(None, None, [],
+ svntest.actions.run_and_verify_svnadmin(None, [],
'freeze', '-F', arg_file, '--',
sys.executable, '-c', 'True')
@@ -2663,17 +2655,17 @@ def fsfs_hotcopy_progress(sbox):
]
backup_dir, backup_url = sbox.add_repo_path('backup-0')
- svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+ svntest.actions.run_and_verify_svnadmin(expected_full, [],
'hotcopy',
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+ svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
'hotcopy', '--incremental',
sbox.repo_dir, inc_backup_dir)
# Commit three revisions. After this step we have a full shard
# (r0, r1, r2) and the second shard (r3) with a single revision.
for i in range(3):
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir',
'-m', svntest.main.make_log_msg(),
sbox.repo_url + '/dir-%i' % i)
expected_full = [
@@ -2689,10 +2681,10 @@ def fsfs_hotcopy_progress(sbox):
]
backup_dir, backup_url = sbox.add_repo_path('backup-1')
- svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+ svntest.actions.run_and_verify_svnadmin(expected_full, [],
'hotcopy',
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+ svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
'hotcopy', '--incremental',
sbox.repo_dir, inc_backup_dir)
@@ -2700,7 +2692,7 @@ def fsfs_hotcopy_progress(sbox):
# the --incremental output should track the incoming (r0, r1, r2) pack and
# should not mention r3, because it is already a part of the destination
# and is *not* a part of the incoming pack.
- svntest.actions.run_and_verify_svnadmin(None, None, [], 'pack',
+ svntest.actions.run_and_verify_svnadmin(None, [], 'pack',
sbox.repo_dir)
expected_full = [
"* Copied revisions from 0 to 2.\n",
@@ -2711,25 +2703,25 @@ def fsfs_hotcopy_progress(sbox):
]
backup_dir, backup_url = sbox.add_repo_path('backup-2')
- svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+ svntest.actions.run_and_verify_svnadmin(expected_full, [],
'hotcopy',
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+ svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
'hotcopy', '--incremental',
sbox.repo_dir, inc_backup_dir)
# Fill the second shard, pack again, commit several unpacked revisions
# on top of it. Rerun the hotcopy and check the progress output.
for i in range(4, 6):
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir',
'-m', svntest.main.make_log_msg(),
sbox.repo_url + '/dir-%i' % i)
- svntest.actions.run_and_verify_svnadmin(None, None, [], 'pack',
+ svntest.actions.run_and_verify_svnadmin(None, [], 'pack',
sbox.repo_dir)
for i in range(6, 8):
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir',
'-m', svntest.main.make_log_msg(),
sbox.repo_url + '/dir-%i' % i)
expected_full = [
@@ -2745,10 +2737,10 @@ def fsfs_hotcopy_progress(sbox):
]
backup_dir, backup_url = sbox.add_repo_path('backup-3')
- svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+ svntest.actions.run_and_verify_svnadmin(expected_full, [],
'hotcopy',
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+ svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
'hotcopy', '--incremental',
sbox.repo_dir, inc_backup_dir)
@@ -2766,7 +2758,7 @@ def fsfs_hotcopy_progress_with_revprop_c
sbox.build(create_wc=False, empty=True)
for i in range(6):
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir',
'-m', svntest.main.make_log_msg(),
sbox.repo_url + '/dir-%i' % i)
expected_output = [
@@ -2780,7 +2772,7 @@ def fsfs_hotcopy_progress_with_revprop_c
]
backup_dir, backup_url = sbox.add_repo_path('backup')
- svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+ svntest.actions.run_and_verify_svnadmin(expected_output, [],
'hotcopy',
sbox.repo_dir, backup_dir)
@@ -2790,7 +2782,7 @@ def fsfs_hotcopy_progress_with_revprop_c
svntest.main.file_write(revprop_file, "Modified log message.")
for i in [1, 3, 6]:
- svntest.actions.run_and_verify_svnadmin(None, None, [],
+ svntest.actions.run_and_verify_svnadmin(None, [],
'setrevprop',
sbox.repo_dir, '-r', i,
'svn:log', revprop_file)
@@ -2799,7 +2791,7 @@ def fsfs_hotcopy_progress_with_revprop_c
"* Copied revision 3.\n",
"* Copied revision 6.\n",
]
- svntest.actions.run_and_verify_svnadmin(None, expected_output, [],
+ svntest.actions.run_and_verify_svnadmin(expected_output, [],
'hotcopy', '--incremental',
sbox.repo_dir, backup_dir)
@@ -2821,16 +2813,16 @@ def fsfs_hotcopy_progress_old(sbox):
]
backup_dir, backup_url = sbox.add_repo_path('backup-0')
- svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+ svntest.actions.run_and_verify_svnadmin(expected_full, [],
'hotcopy',
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+ svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
'hotcopy', '--incremental',
sbox.repo_dir, inc_backup_dir)
# Commit three revisions, hotcopy and check the progress output.
for i in range(3):
- svntest.actions.run_and_verify_svn(None, None, [], 'mkdir',
+ svntest.actions.run_and_verify_svn(None, [], 'mkdir',
'-m', svntest.main.make_log_msg(),
sbox.repo_url + '/dir-%i' % i)
@@ -2847,10 +2839,10 @@ def fsfs_hotcopy_progress_old(sbox):
]
backup_dir, backup_url = sbox.add_repo_path('backup-1')
- svntest.actions.run_and_verify_svnadmin(None, expected_full, [],
+ svntest.actions.run_and_verify_svnadmin(expected_full, [],
'hotcopy',
sbox.repo_dir, backup_dir)
- svntest.actions.run_and_verify_svnadmin(None, expected_incremental, [],
+ svntest.actions.run_and_verify_svnadmin(expected_incremental, [],
'hotcopy', '--incremental',
sbox.repo_dir, inc_backup_dir)
@@ -2882,7 +2874,7 @@ def freeze_same_uuid(sbox):
svntest.main.file_write(arg_file,
"%s\n%s\n" % (first_repo_dir, second_repo_dir))
- svntest.actions.run_and_verify_svnadmin(None, None, None,
+ svntest.actions.run_and_verify_svnadmin(None, None,
'freeze', '-F', arg_file, '--',
sys.executable, '-c', 'True')
@@ -2892,10 +2884,10 @@ def upgrade(sbox):
"upgrade --compatible-version=1.3"
sbox.build(create_wc=False, minor_version=3)
- svntest.actions.run_and_verify_svnadmin(None, None, [], "upgrade",
+ svntest.actions.run_and_verify_svnadmin(None, [], "upgrade",
sbox.repo_dir)
# Does the repository work after upgrade?
- svntest.actions.run_and_verify_svn(None, ['Committing transaction...\n',
+ svntest.actions.run_and_verify_svn(['Committing transaction...\n',
'Committed revision 2.\n'], [], 'mkdir',
'-m', svntest.main.make_log_msg(),
sbox.repo_url + '/dir')