Author: rhuijben
Date: Fri Feb 27 18:57:57 2015
New Revision: 1662794
URL: http://svn.apache.org/r1662794
Log:
Make the standard commit logic in the test suite a bit stricter and easier
to use by using the existing run_and_verify_svn() infrastructure for
verifying the error result. When no arguments are passed, pass the directory
used for verifying the result, just like run_and_verify_update() and its
variants.
We already removed an argument from this function for 1.9, so cleaning it
up a bit more won't affect backporting.
* subversion/test/cmdline/authz_tests.py
* subversion/test/cmdline/basic_tests.py
* subversion/test/cmdline/blame_tests.py
* subversion/test/cmdline/changelist_tests.py
* subversion/test/cmdline/checkout_tests.py
* subversion/test/cmdline/commit_tests.py
* subversion/test/cmdline/copy_tests.py
* subversion/test/cmdline/depth_tests.py
* subversion/test/cmdline/diff_tests.py
* subversion/test/cmdline/entries_tests.py
* subversion/test/cmdline/export_tests.py
* subversion/test/cmdline/externals_tests.py
* subversion/test/cmdline/history_tests.py
* subversion/test/cmdline/lock_tests.py
* subversion/test/cmdline/log_tests.py
* subversion/test/cmdline/merge_authz_tests.py
* subversion/test/cmdline/merge_reintegrate_tests.py
* subversion/test/cmdline/merge_tests.py
* subversion/test/cmdline/merge_tree_conflict_tests.py
* subversion/test/cmdline/mergeinfo_tests.py
* subversion/test/cmdline/patch_tests.py
* subversion/test/cmdline/prop_tests.py
* subversion/test/cmdline/relocate_tests.py
* subversion/test/cmdline/resolve_tests.py
* subversion/test/cmdline/revert_tests.py
* subversion/test/cmdline/schedule_tests.py
* subversion/test/cmdline/special_tests.py
* subversion/test/cmdline/stat_tests.py
* subversion/test/cmdline/svnauthz_tests.py
* subversion/test/cmdline/svnlook_tests.py
* subversion/test/cmdline/svnversion_tests.py
* subversion/test/cmdline/switch_tests.py
* subversion/test/cmdline/trans_tests.py
* subversion/test/cmdline/tree_conflict_tests.py
* subversion/test/cmdline/update_tests.py
Tweak tests. Remove unneeded args if possible without changing behavior.
* subversion/test/cmdline/svntest/actions.py
(run_and_verify_commit): Update error argument name and behavior. Supply
default args if none ar provided.
(inject_conflict_into_wc,
build_greek_tree_conflicts): Update caller.
* subversion/test/cmdline/svntest/deeptrees.py
(deep_trees_run_tests_scheme_for_update,
deep_trees_run_tests_scheme_for_switch,
deep_trees_run_tests_scheme_for_merge,
commit_routine_switching): Update caller.
* subversion/test/cmdline/svntest/mergetrees.py
(set_up_dir_replace,
set_up_branch): Update caller.
Modified:
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/blame_tests.py
subversion/trunk/subversion/tests/cmdline/changelist_tests.py
subversion/trunk/subversion/tests/cmdline/checkout_tests.py
subversion/trunk/subversion/tests/cmdline/commit_tests.py
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/diff_tests.py
subversion/trunk/subversion/tests/cmdline/entries_tests.py
subversion/trunk/subversion/tests/cmdline/export_tests.py
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/history_tests.py
subversion/trunk/subversion/tests/cmdline/lock_tests.py
subversion/trunk/subversion/tests/cmdline/log_tests.py
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
subversion/trunk/subversion/tests/cmdline/patch_tests.py
subversion/trunk/subversion/tests/cmdline/prop_tests.py
subversion/trunk/subversion/tests/cmdline/relocate_tests.py
subversion/trunk/subversion/tests/cmdline/resolve_tests.py
subversion/trunk/subversion/tests/cmdline/revert_tests.py
subversion/trunk/subversion/tests/cmdline/schedule_tests.py
subversion/trunk/subversion/tests/cmdline/special_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py
subversion/trunk/subversion/tests/cmdline/svnlook_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py
subversion/trunk/subversion/tests/cmdline/svnversion_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/trans_tests.py
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/authz_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Fri Feb 27
18:57:57 2015
@@ -83,7 +83,7 @@ def authz_open_root(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
None,
- None,
+ [],
mu_path)
#----------------------------------------------------------------------
@@ -119,9 +119,7 @@ def authz_open_directory(sbox):
# Commit the working copy.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
@Skip(svntest.main.is_ra_type_file)
@SkipDumpLoadCrossCheck()
@@ -770,7 +768,7 @@ def authz_locking(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
[],
- None,
+ [],
mu_path)
# Lock two paths one of which fails. First add read access to '/' so
@@ -1135,7 +1133,7 @@ def case_sensitive_authz(sbox):
})
# error messages
- expected_error_for_commit = "Commit failed"
+ expected_error_for_commit = ".*Commit failed.*"
if sbox.repo_url.startswith("http"):
expected_error_for_cat = ".*[Ff]orbidden.*"
@@ -1204,7 +1202,7 @@ def case_sensitive_authz(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
None,
- None,
+ [],
mu_path)
@Skip(svntest.main.is_ra_type_file)
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Feb 27
18:57:57 2015
@@ -140,9 +140,7 @@ def basic_commit(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -176,7 +174,7 @@ def basic_update(sbox):
# Commit.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Create expected output tree for an update of the wc_backup.
expected_output = wc.State(wc_backup, {
@@ -406,8 +404,7 @@ def basic_commit_corruption(sbox):
# This commit should fail due to text base corruption.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
None, # expected_status,
- "svn: E200014: Checksum",
- wc_dir)
+ "svn: E200014: Checksum")
# Restore the uncorrupted text base.
os.chmod(tb_dir_path, 0777)
@@ -419,7 +416,7 @@ def basic_commit_corruption(sbox):
# This commit should succeed.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
def basic_update_corruption(sbox):
@@ -463,7 +460,7 @@ def basic_update_corruption(sbox):
# This commit should succeed.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Create expected output tree for an update of the other_wc.
expected_output = wc.State(other_wc, {
@@ -558,7 +555,7 @@ def basic_merging_update(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir)
# Make a backup copy of the working copy
@@ -584,7 +581,7 @@ def basic_merging_update(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir)
# Make local mods to wc_backup by recreating mu and rho
@@ -665,7 +662,7 @@ def basic_conflict(sbox):
# Commit.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Create expected output tree for an update of the wc_backup.
expected_output = wc.State(wc_backup, {
@@ -1292,8 +1289,7 @@ def basic_checkout_deleted(sbox):
'A/D/gamma')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
# Now try to checkout revision 1 of A/D.
url = sbox.repo_url + '/A/D'
@@ -1335,8 +1331,7 @@ def basic_node_kind_change(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/gamma', status=' ', wc_rev='2')
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
# Try and fail to create a directory (file deleted)
svntest.actions.run_and_verify_svn(None, svntest.verify.AnyOutput,
@@ -1681,9 +1676,7 @@ def basic_add_parents(sbox):
# Commit and verify
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [],
'rm', X_path, '--keep-local')
@@ -1852,9 +1845,7 @@ def info_nonhead(sbox):
expected_status.remove("iota")
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Get info for old iota at r1.
expected_infos = [
{ 'URL' : '.*' },
@@ -1883,8 +1874,7 @@ def ls_nonhead(sbox):
expected_status.remove('A/D/G', 'A/D/G/rho', 'A/D/G/pi', 'A/D/G/tau',)
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
# Check that we can list a file in A/D/G at revision 1.
rho_url = sbox.repo_url + "/A/D/G/rho"
@@ -1951,9 +1941,7 @@ def delete_keep_local(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Update working copy to check disk state still greek tree
expected_disk = svntest.main.greek_state.copy()
@@ -2208,7 +2196,7 @@ def automatic_conflict_resolution(sbox):
# Commit.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Create expected output tree for an update of the wc_backup.
expected_output = wc.State(wc_backup, {
@@ -2689,9 +2677,7 @@ def delete_and_add_same_file(sbox):
# not found".
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def delete_child_parent_update(sbox):
"rm child, commit, rm parent"
@@ -2710,9 +2696,7 @@ def delete_child_parent_update(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
svntest.main.run_svn(wc_dir, 'rm', sbox.ospath('A/B/E'))
expected_status.tweak('A/B/E', 'A/B/E/beta', status='D ')
Modified: subversion/trunk/subversion/tests/cmdline/blame_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/blame_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/blame_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/blame_tests.py Fri Feb 27
18:57:57 2015
@@ -213,7 +213,7 @@ def blame_in_xml(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# Retrieve last changed date from svn info
exit_code, output, error = svntest.actions.run_and_verify_svn(
@@ -284,7 +284,7 @@ def blame_on_unknown_revision(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
exit_code, output, error = svntest.actions.run_and_verify_svn(
None, [],
@@ -355,13 +355,13 @@ def blame_eol_styles(sbox):
for i in range(1,3):
svntest.main.file_append(file_path, "Extra line %d" % (i) + "\n")
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
svntest.main.run_svn(None, 'propset', 'svn:eol-style', eol,
file_path)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
exit_code, output, error = svntest.actions.run_and_verify_svn(
None, [],
@@ -389,7 +389,7 @@ def blame_ignore_whitespace(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# commit only whitespace changes
svntest.main.file_write(file_path,
@@ -400,7 +400,7 @@ def blame_ignore_whitespace(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# match the blame output, as defined in the blame code:
# "%6ld %10s %s %s%s", rev, author ? author : " -",
@@ -425,7 +425,7 @@ def blame_ignore_whitespace(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
expected_output = [
" 2 jrandom A a \n",
@@ -454,7 +454,7 @@ def blame_ignore_eolstyle(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# commit only eol changes
svntest.main.file_write(file_path,
@@ -465,7 +465,7 @@ def blame_ignore_eolstyle(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
expected_output = [
" 2 jrandom Aa\n",
@@ -652,7 +652,7 @@ def blame_output_after_merge(sbox):
'trunk/A/mu' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# r4: create branches/br from trunk
branches_br_url = sbox.repo_url + "/branches/br"
@@ -678,7 +678,7 @@ def blame_output_after_merge(sbox):
'branches/br/A/mu' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# r6: Insert a single line in branches/A/mu
svntest.main.file_write(branch_mu_path,
@@ -694,7 +694,7 @@ def blame_output_after_merge(sbox):
'branches/br/A/mu' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# r7: merge branches/br back to trunk
trunk_path = os.path.join(wc_dir, "trunk")
@@ -706,7 +706,7 @@ def blame_output_after_merge(sbox):
'trunk/A/mu' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# Now test blame, first without the -g option
expected_output = [ " 3 jrandom New version of file 'mu'.\n",
Modified: subversion/trunk/subversion/tests/cmdline/changelist_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/changelist_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/changelist_tests.py Fri Feb 27
18:57:57 2015
@@ -442,7 +442,7 @@ def commit_one_changelist(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir,
"--changelist",
"a")
@@ -483,7 +483,7 @@ def commit_multiple_changelists(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir,
"--changelist", "a",
"--changelist", "i")
@@ -907,7 +907,7 @@ def tree_conflicts_and_changelists_on_co
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir,
"--changelist",
"list")
@@ -980,7 +980,7 @@ def tree_conflicts_and_changelists_on_co
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir,
"--changelist",
"list")
Modified: subversion/trunk/subversion/tests/cmdline/checkout_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/checkout_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/checkout_tests.py Fri Feb 27
18:57:57 2015
@@ -807,7 +807,7 @@ def co_with_obstructing_local_adds(sbox)
# Commit.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Create various paths scheduled for addition which will obstruct
# the adds coming from the repos.
Modified: subversion/trunk/subversion/tests/cmdline/commit_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/commit_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/commit_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/commit_tests.py Fri Feb 27
18:57:57 2015
@@ -174,7 +174,7 @@ def commit_one_file(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
omega_path)
@@ -200,7 +200,7 @@ def commit_one_new_file(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
gloo_path)
@@ -229,7 +229,7 @@ def commit_one_new_binary_file(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
gloo_path)
@@ -283,7 +283,7 @@ def commit_multiple_targets(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
psi_path, AB_path, pi_path)
#----------------------------------------------------------------------
@@ -339,7 +339,7 @@ def commit_multiple_targets_2(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
psi_path, AB_path,
omega_path, pi_path)
@@ -375,7 +375,7 @@ def commit_inclusive_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
D_path)
#----------------------------------------------------------------------
@@ -417,7 +417,7 @@ def commit_top_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir)
#----------------------------------------------------------------------
@@ -449,7 +449,7 @@ def commit_unversioned_thing(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- "is not under version control",
+ ".*is not under version control.*",
os.path.join(wc_dir,'blorg'))
#----------------------------------------------------------------------
@@ -527,9 +527,7 @@ def nested_dir_replacements(sbox):
# Commit from the top of the working copy and verify output & status.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -560,8 +558,7 @@ def hudson_part_1(sbox):
# Commit the deletion of gamma and verify.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now gamma should be marked as `deleted' under the hood. When we
# update, we should no output, and a perfect, virginal status list
@@ -611,8 +608,7 @@ def hudson_part_1_variation_1(sbox):
# Commit the deletion of H and verify.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now H should be marked as `deleted' under the hood. When we
# update, we should no see output, and a perfect, virginal status
@@ -662,8 +658,7 @@ def hudson_part_1_variation_2(sbox):
# Commit the deletion of gamma and verify.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now gamma should be marked as `deleted' under the hood.
# Go ahead and re-add gamma, so that is *also* scheduled for addition.
@@ -688,8 +683,7 @@ def hudson_part_1_variation_2(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -722,8 +716,7 @@ def hudson_part_2(sbox):
# Commit the deletion of gamma and verify.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now gamma should be marked as `deleted' under the hood, at
# revision 2. Meanwhile, A/D is still lagging at revision 1.
@@ -735,8 +728,7 @@ def hudson_part_2(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- "[Oo]ut.of.date",
- wc_dir)
+ ".*[Oo]ut of date.*")
#----------------------------------------------------------------------
@@ -787,8 +779,7 @@ def hudson_part_2_1(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now, assuming all three files in H are marked as 'deleted', an
# update of H should print absolutely nothing.
@@ -905,8 +896,7 @@ def merge_mixed_revisions(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# 2. svn up A/D/H
@@ -940,8 +930,7 @@ def merge_mixed_revisions(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# 4. echo "moo" >> A/D/H/chi; svn ci A/D/H/chi
@@ -955,8 +944,7 @@ def merge_mixed_revisions(sbox):
expected_status.tweak('iota', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# 5. echo "moo" >> iota; svn ci iota
svntest.main.file_append(iota_path, "moomoo")
@@ -969,8 +957,7 @@ def merge_mixed_revisions(sbox):
expected_status.tweak('iota', wc_rev=5)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# At this point, here is what our tree should look like:
# _ 1 ( 5) working_copies/commit_tests-10
@@ -1011,8 +998,7 @@ def merge_mixed_revisions(sbox):
expected_status.tweak('A/D/H/chi', wc_rev=4)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -1089,8 +1075,7 @@ def commit_uri_unsafe(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -1126,8 +1111,7 @@ def commit_deleted_edited(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -1234,9 +1218,7 @@ def commit_add_file_twice(sbox):
# Commit should succeed
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Update to state before commit
svntest.main.run_svn(None, 'up', '-r', '1', wc_dir)
@@ -1249,8 +1231,7 @@ def commit_add_file_twice(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
None,
None,
- "E160020: File.*already exists",
- wc_dir)
+ ".*E160020: File.*already exists.*")
#----------------------------------------------------------------------
@@ -1286,9 +1267,7 @@ def commit_from_long_dir(sbox):
svntest.actions.run_and_verify_commit(abs_wc_dir,
expected_output,
- None,
- None,
- abs_wc_dir)
+ None)
#----------------------------------------------------------------------
@@ -1309,8 +1288,7 @@ def commit_with_lock(sbox):
None,
None,
'svn: E155004: '
- 'Working copy \'.*\' locked',
- wc_dir)
+ 'Working copy \'.*\' locked')
# unlock directory
svntest.actions.run_and_verify_svn([], [],
@@ -1324,9 +1302,7 @@ def commit_with_lock(sbox):
expected_status.tweak('A/D/gamma', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -1350,9 +1326,7 @@ def commit_current_dir(sbox):
})
svntest.actions.run_and_verify_commit('.',
expected_output,
- None,
- None,
- '.')
+ None)
os.chdir(was_cwd)
# I can't get the status check to work as part of run_and_verify_commit.
@@ -1622,7 +1596,7 @@ def commit_nonrecursive(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
'-N',
sbox.ospath(file1_path),
sbox.ospath(dir1_path),
@@ -1749,7 +1723,7 @@ def commit_nonrecursive(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
'-N', sbox.ospath(dirA_path))
#----------------------------------------------------------------------
@@ -1819,7 +1793,7 @@ def commit_out_of_date_deletions(sbox):
status=' ')
expected_status.remove('A/B/F', 'A/D/H/chi', 'A/B/E/beta', 'A/D/H/psi')
commit = svntest.actions.run_and_verify_commit
- commit(wc_dir, expected_output, expected_status, None, wc_dir)
+ commit(wc_dir, expected_output, expected_status, [], wc_dir)
# Edits in wc backup
I_path = os.path.join(wc_backup, 'A', 'I')
@@ -1840,7 +1814,7 @@ def commit_out_of_date_deletions(sbox):
# A commit of any one of these files or dirs should fail, preferably
# with an out-of-date error message.
- error_re = "(out of date|not found)"
+ error_re = ".*(out of date|not found).*"
commit(wc_backup, None, None, error_re, C_path)
commit(wc_backup, None, None, error_re, I_path)
commit(wc_backup, None, None, error_re, F_path)
@@ -1868,7 +1842,7 @@ def commit_with_bad_log_message(sbox):
# Commit and expect an error.
svntest.actions.run_and_verify_commit(wc_dir,
None, None,
- "contains a zero byte",
+ ".*contains a zero byte.*",
'-F', log_msg_path,
iota_path)
@@ -1890,9 +1864,10 @@ def commit_with_mixed_line_endings(sbox)
svntest.main.file_append(log_msg_path, "test\nthis\n\rcase\r\n--This line,
and those below, will be ignored--\n")
# Commit and expect an error.
+ expected_stderr = ".*E135000: Error normalizing log message to internal
format.*"
svntest.actions.run_and_verify_commit(wc_dir,
None, None,
- "Error normalizing log message to
internal format",
+ expected_stderr,
'-F', log_msg_path,
iota_path)
@@ -1923,7 +1898,7 @@ def commit_with_mixed_line_endings_in_ig
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
iota_path)
def from_wc_top_with_bad_editor(sbox):
@@ -1991,8 +1966,7 @@ def mods_in_schedule_delete(sbox):
'A/C' : Item(verb='Deleting'),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
# Unversioned file still exists
actual_contents = open(foo_path).read()
@@ -2165,7 +2139,7 @@ def commit_same_folder_in_targets(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
'-N',
wc_dir,
iota_path)
@@ -2261,7 +2235,7 @@ def commit_with_revprop(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
'-m', 'msg',
'--with-revprop', 'bug=62',
omega_path, gloo_path)
@@ -2637,7 +2611,7 @@ def changelist_near_conflict(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
"--changelist=" + changelist_name,
"-m", "msg", wc_dir)
@@ -2665,9 +2639,7 @@ def commit_out_of_date_file(sbox):
expected_status.tweak("A/D/G/pi", wc_rev=2, status=" ")
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- "-m", "log message", wc_dir)
+ expected_status)
svntest.main.file_append(backup_pi_path, "hello")
expected_err = ".*(pi.*out of date|Out of date.*pi).*"
@@ -2757,7 +2729,7 @@ def tree_conflicts_block_commit(sbox):
D = sbox.ospath('A/D')
G = sbox.ospath('A/D/G')
- error_re = "remains in conflict"
+ error_re = ".*remains in conflict.*"
commit_fails_at_path(wc_dir, wc_dir, error_re)
commit_fails_at_path(A, A, error_re)
commit_fails_at_path(D, D, error_re)
@@ -2831,9 +2803,7 @@ def commit_incomplete(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Reported here:
@@ -2883,8 +2853,7 @@ def commit_danglers(sbox):
svntest.actions.run_and_verify_commit(mu_copied,
None,
None,
- expected_error,
- mu_copied)
+ expected_error)
# But now do the same thing via changelist filtering
svntest.main.run_svn(None, 'changelist', 'L', mu_copied, sbox.ospath('A/mu'))
@@ -2935,7 +2904,7 @@ def commit_unversioned(sbox):
sbox.build(read_only=True)
wc_dir = sbox.wc_dir
- expected_err = 'E200009: .*existing.*\' is not under version control'
+ expected_err = '.*E200009: .*existing.*\' is not under version control.*'
# Unversioned, but existing file
svntest.main.file_write(sbox.ospath('existing'), "xxxx")
@@ -2994,9 +2963,7 @@ def commit_cp_with_deep_delete(sbox):
# Commit the copy without the one dir.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def commit_deep_deleted(sbox):
"try to commit a deep descendant of a deleted node"
@@ -3008,9 +2975,9 @@ def commit_deep_deleted(sbox):
sbox.simple_propset('k', 'v', 'AA/D/G')
# Committing some added descendant returns a proper error
- expected_err = ('svn: E200009: \'%s\' is not known to exist in the ' +
+ expected_err = ('.*svn: E200009: \'%s\' is not known to exist in the ' +
'repository and is not part of the commit, yet its ' +
- 'child \'%s\' is part of the commit') % (
+ 'child \'%s\' is part of the commit.*') % (
re.escape(os.path.abspath(sbox.ospath('AA'))),
re.escape(os.path.abspath(sbox.ospath('AA/D/G'))))
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Feb 27 18:57:57
2015
@@ -91,8 +91,7 @@ or a url (when false) copy source is use
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Helper for wc_copy_replace_with_props and
# repos_to_wc_copy_replace_with_props
@@ -139,8 +138,7 @@ def copy_replace_with_props(sbox, wc_cop
expected_status.tweak('A/D/G/rho', wc_rev='2')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Bring wc into sync
svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir)
@@ -184,8 +182,7 @@ def copy_replace_with_props(sbox, wc_cop
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
######################################################################
@@ -324,9 +321,7 @@ def basic_copy_and_move_files(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Issue 1091, alpha2 would now have the wrong checksum and so a
# subsequent commit would fail
@@ -337,9 +332,7 @@ def basic_copy_and_move_files(sbox):
expected_status.tweak('A/C/alpha2', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Assure that attempts at local copy and move fail when a log
# message is provided.
@@ -391,9 +384,7 @@ def receive_copy_in_update(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Now update the other working copy; it should receive a full add of
# the newG directory and its contents.
@@ -465,9 +456,7 @@ def resurrect_deleted_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Use 'svn cp URL@1 URL' to resurrect the deleted directory, where
# the two URLs are identical. This used to trigger a failure.
@@ -512,9 +501,7 @@ def copy_deleted_dir_into_prefix(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
# Ok, copy from a deleted URL into a prefix of that URL, this used to
# result in an assert failing.
@@ -618,9 +605,7 @@ def copy_modify_commit(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
#----------------------------------------------------------------------
@@ -645,8 +630,7 @@ def copy_files_with_properties(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/D/G/rho', status=' ', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
# Set another property, but don't commit it yet
svntest.actions.run_and_verify_svn(None, [],
@@ -692,8 +676,7 @@ def copy_files_with_properties(sbox):
'A/D/G/rho_url' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, expected_status,
- None, wc_dir)
+ expected_output, expected_status)
#----------------------------------------------------------------------
@@ -725,9 +708,7 @@ def copy_delete_commit(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
# copy a tree
svntest.actions.run_and_verify_svn(None, [], 'cp',
@@ -745,9 +726,7 @@ def copy_delete_commit(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- None,
- None,
- wc_dir)
+ None)
#----------------------------------------------------------------------
@@ -1340,11 +1319,9 @@ def revision_kinds_local_source(sbox):
expected_output = svntest.wc.State(wc_dir, {
'A/mu' : Item(verb='Sending'), })
svntest.main.file_append(mu_path, "New r2 text.\n")
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
svntest.main.file_append(mu_path, "New r3 text.\n")
- svntest.actions.run_and_verify_commit(wc_dir, expected_output, None,
- None, wc_dir)
+ svntest.actions.run_and_verify_commit(wc_dir, expected_output, None)
svntest.actions.run_and_verify_svn(None, [], 'up', '-r2', mu_path)
svntest.main.file_append(mu_path, "Working copy.\n")
@@ -1439,8 +1416,7 @@ def repos_to_wc_1634(sbox):
expected_status.remove('A/B/E', 'A/B/E/alpha', 'A/B/E/beta')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Now copy the directory back.
E_url = sbox.repo_url + "/A/B/E@1"
@@ -1551,8 +1527,7 @@ def wc_to_wc_copy_deleted(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Copy including stuff in state not-present
svntest.actions.run_and_verify_svn(None, [], 'copy', B_path, B2_path)
@@ -1608,8 +1583,7 @@ def wc_to_wc_copy_deleted(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Test for copy into a non-existent URL path
@@ -1984,8 +1958,7 @@ def force_move(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(expected_file_content, [],
'cat',
sbox.repo_url + '/dest')
@@ -2046,9 +2019,7 @@ def copy_copied_file_and_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_copied_file_and_dir(sbox):
@@ -2101,9 +2072,7 @@ def move_copied_file_and_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_moved_file_and_dir(sbox):
@@ -2160,9 +2129,7 @@ def move_moved_file_and_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_file_within_moved_dir(sbox):
@@ -2229,9 +2196,7 @@ def move_file_within_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_file_out_of_moved_dir(sbox):
@@ -2297,9 +2262,7 @@ def move_file_out_of_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_dir_within_moved_dir(sbox):
@@ -2365,9 +2328,7 @@ def move_dir_within_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def move_dir_out_of_moved_dir(sbox):
@@ -2432,9 +2393,7 @@ def move_dir_out_of_moved_dir(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Includes regression testing for issue #3429 ("svn mv A B; svn mv B A"
# generates replace without history).
@@ -2463,9 +2422,7 @@ def move_file_back_and_forth(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Includes regression testing for issue #3429 ("svn mv A B; svn mv B A"
@@ -2610,9 +2567,7 @@ def copy_move_added_paths(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Run_and_verify_commit() doesn't handle status of unversioned paths
# so manually confirm unversioned paths got copied and moved too.
@@ -2703,9 +2658,7 @@ def copy_added_paths_with_props(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
svntest.actions.verify_disk(wc_dir, expected_disk.old_tree(), True)
def copy_added_paths_to_URL(sbox):
@@ -2795,9 +2748,7 @@ def copy_added_paths_to_URL(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Created expected output for update
expected_output = svntest.wc.State(wc_dir, {
@@ -2990,9 +2941,7 @@ def move_multiple_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3037,9 +2986,7 @@ def copy_multiple_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3212,8 +3159,7 @@ def copy_multiple_repo_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3516,9 +3462,7 @@ def old_dir_wc_to_wc(sbox):
# Commit the one file.
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3558,9 +3502,7 @@ def copy_make_parents_wc_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
# Test copying and creating parents from the repo to the wc
@@ -3600,9 +3542,7 @@ def copy_make_parents_repo_wc(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
#----------------------------------------------------------------------
@@ -3787,8 +3727,7 @@ def URI_encoded_repos_to_wc(sbox):
{dest_name : Item(verb='Adding')})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
copy_URL_to_WC('A', 'A COPY', 2)
copy_URL_to_WC('A COPY', 'A_COPY_2', 3)
@@ -4162,8 +4101,7 @@ def copy_below_copy(sbox):
svntest.actions.run_and_verify_commit(sbox.wc_dir,
expected_output,
- expected_status,
- None, sbox.wc_dir)
+ expected_status)
def move_below_move(sbox):
"move a dir below a moved dir"
@@ -4224,8 +4162,7 @@ def move_below_move(sbox):
svntest.actions.run_and_verify_commit(sbox.wc_dir,
expected_output,
- expected_status,
- None, sbox.wc_dir)
+ expected_status)
def reverse_merge_move(sbox):
@@ -4346,7 +4283,7 @@ def nonrecursive_commit_of_copy(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
wc_dir, '--depth', 'immediates')
# Regression test for issue #3474 - making a new subdir, moving files into it
@@ -4525,8 +4462,7 @@ def move_dir_containing_move(sbox):
'A/B_moved/F_moved', moved_from=None)
svntest.actions.run_and_verify_commit(sbox.wc_dir,
expected_output,
- expected_status,
- None, sbox.wc_dir)
+ expected_status)
def copy_dir_with_space(sbox):
"""copy a directory with whitespace to one without"""
@@ -4555,8 +4491,7 @@ def copy_dir_with_space(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [], 'cp',
sbox.ospath('E with spaces'),
@@ -4581,8 +4516,7 @@ def copy_dir_with_space(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
svntest.actions.run_and_verify_svn(None, [], 'mv',
sbox.ospath('E with spaces'),
@@ -4614,8 +4548,7 @@ def copy_dir_with_space(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Regression test for issue #3676
@Issue(3676)
@@ -4747,9 +4680,7 @@ def mixed_rev_copy_del(sbox):
expected_status.remove('A/B/E/alpha')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Update to r2, then update A/B/E/alpha and A/B/E/beta to r1
svntest.main.run_svn(None, 'up', wc_dir)
@@ -4804,9 +4735,7 @@ def mixed_rev_copy_del(sbox):
expected_status.remove('A/B/E_copy/alpha', 'A/B/E_copy/beta')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
def copy_delete_undo(sbox, use_revert):
"copy, delete child, undo"
@@ -5662,8 +5591,7 @@ def wc_wc_copy_incomplete(sbox):
expected_status.remove('A/B2/E', 'A/B2/F')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
expected_status.add({
'A/B2/E' : Item(status='! ', wc_rev=3),
'A/B2/F' : Item(status='! ', wc_rev=3),
@@ -5724,8 +5652,7 @@ def three_nested_moves(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
def copy_to_unversioned_parent(sbox):
"copy to unversioned parent"
@@ -5863,8 +5790,7 @@ def ext_wc_copy_deleted(sbox):
})
svntest.actions.run_and_verify_commit(wc2_dir,
- expected_output, None, None,
- wc2_dir)
+ expected_output, None)
def copy_subtree_deleted(sbox):
"copy to-be-deleted subtree"
@@ -5883,7 +5809,7 @@ def copy_subtree_deleted(sbox):
'AA/B' : Item(verb='Deleting'),
})
svntest.actions.run_and_verify_commit(wc_dir,
- expected_output, None, None,
+ expected_output, None, [],
sbox.ospath('AA'))
# Commit copy between working copies
@@ -5895,8 +5821,7 @@ def copy_subtree_deleted(sbox):
'AA2/B' : Item(verb='Deleting'),
})
svntest.actions.run_and_verify_commit(wc2_dir,
- expected_output, None, None,
- wc2_dir)
+ expected_output, None)
########################################################################
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Fri Feb 27
18:57:57 2015
@@ -183,8 +183,7 @@ def depth_empty_update_bypass_single_fil
expected_status.tweak('iota', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-empty wc, expecting not to receive the change to iota.
expected_output = svntest.wc.State(wc_empty, { })
@@ -235,8 +234,7 @@ def depth_immediates_get_top_file_mod_on
expected_status.tweak('A/mu', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting to receive only the
# change to iota.
@@ -286,9 +284,7 @@ def depth_empty_commit(sbox):
})
svntest.actions.run_and_verify_commit(wc_empty,
expected_output,
- expected_status,
- None,
- wc_empty)
+ expected_status)
#----------------------------------------------------------------------
def depth_empty_with_file(sbox):
@@ -320,8 +316,7 @@ def depth_empty_with_file(sbox):
expected_status.tweak('iota', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Delete iota in the "other" wc.
other_iota_path = os.path.join(wc, 'iota')
@@ -331,8 +326,7 @@ def depth_empty_with_file(sbox):
expected_status.remove('iota')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-empty wc just a little, expecting to receive
# the change in iota.
@@ -417,8 +411,7 @@ def depth_empty_with_dir(sbox):
expected_status.tweak('A/mu', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update "A" by name in wc_empty, expect to receive the change to A/mu.
expected_output = svntest.wc.State(wc_empty, { 'A/mu' : Item(status='U ') })
@@ -444,8 +437,7 @@ def depth_empty_with_dir(sbox):
expected_status.remove('A/mu')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update "A" by name in wc_empty, expect to A/mu to disappear.
@@ -649,8 +641,7 @@ def depth_empty_unreceive_delete(sbox):
expected_status.remove('iota')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-empty wc, expecting not to receive the deletion of iota.
expected_output = svntest.wc.State(wc_empty, { })
@@ -683,8 +674,7 @@ def depth_immediates_unreceive_delete(sb
expected_status.remove('A/mu')
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting not to receive the deletion
# of A/mu.
@@ -725,8 +715,7 @@ def depth_immediates_receive_delete(sbox
})
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting to receive the deletion of A.
expected_output = svntest.wc.State(wc_immed, {
@@ -774,7 +763,7 @@ def depth_immediates_subdir_propset_1(sb
svntest.actions.run_and_verify_commit(wc_immediates,
expected_output,
expected_status,
- None,
+ [],
A_path)
# Create expected output tree for the update.
@@ -981,7 +970,7 @@ def commit_propmods_with_depth_empty_hel
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
depth_arg,
wc_dir, D_path)
@@ -1152,7 +1141,7 @@ def commit_depth_immediates(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
expected_status,
- None,
+ [],
'--depth', 'immediates',
wc_dir, G_path)
@@ -1183,8 +1172,7 @@ def depth_immediates_receive_new_dir(sbo
})
svntest.actions.run_and_verify_commit(wc,
expected_output,
- expected_status,
- None, wc)
+ expected_status)
# Update the depth-immediates wc, expecting to receive just the
# new directory, without the file.
@@ -2012,8 +2000,7 @@ def depth_empty_update_on_file(sbox):
expected_status.tweak('iota', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
# Update iota with depth=empty.
expected_output = svntest.wc.State(wc_dir,
@@ -2222,9 +2209,7 @@ def excluded_path_misc_operation(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Relocate wc, with excluded items in it.
repo_dir = sbox.repo_dir
@@ -2387,7 +2372,7 @@ def make_depth_tree_conflicts(sbox):
svntest.actions.run_and_verify_commit(wc,
expected_output,
expected_status,
- None,
+ [],
A)
# Go back to rev 1
@@ -2827,9 +2812,7 @@ def commit_then_immediates_update(sbox):
expected_status.tweak('A/mu', wc_rev=2, status=' ')
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None,
- wc_dir)
+ expected_status)
# Now, update --depth immediates in the root of the working copy.
expected_output = svntest.wc.State(wc_dir, { })
@@ -2930,8 +2913,7 @@ def commit_excluded(sbox):
svntest.actions.run_and_verify_commit(wc_dir,
expected_output,
- expected_status,
- None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {
'A/D/G' : Item(status='A '),
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Feb 27 18:57:57
2015
@@ -709,7 +709,7 @@ def dont_diff_binary_file(sbox):
# Commit the new binary file, creating revision 2.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Update the whole working copy to HEAD (rev 2)
expected_output = svntest.wc.State(wc_dir, {})
@@ -772,7 +772,7 @@ def dont_diff_binary_file(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Third diff use-case: 'svn diff -r2:3 wc' will compare two
# repository trees.
@@ -869,7 +869,7 @@ def diff_base_to_repos(sbox):
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
@@ -999,7 +999,7 @@ def diff_base_to_repos(sbox):
'A/D/newfile' : Item(status=' ', wc_rev=3),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
@@ -1067,7 +1067,7 @@ def diff_deleted_in_head(sbox):
expected_status.tweak('A/mu', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
expected_output = svntest.wc.State(wc_dir, {})
expected_disk = svntest.main.greek_state.copy()
@@ -1090,7 +1090,7 @@ def diff_deleted_in_head(sbox):
'A/C')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Doing an 'svn diff -r1:2' on the URL of directory A should work,
# especially over the DAV layer.
@@ -1753,7 +1753,7 @@ def diff_force(sbox):
# Commit iota, creating revision 2.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Add another line, while keeping he file as binary.
svntest.main.file_append(iota_path, "another line")
@@ -1769,7 +1769,7 @@ def diff_force(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Check that we get diff when the first, the second and both files
# are marked as binary. First we'll use --force. Then we'll use
@@ -2613,7 +2613,7 @@ def diff_weird_author(sbox):
expected_status.tweak("A/mu", wc_rev=2)
svntest.actions.run_and_verify_commit(sbox.wc_dir, expected_output,
- expected_status, None, sbox.wc_dir)
+ expected_status)
svntest.main.run_svn(None,
"propset", "--revprop", "-r", "2", "svn:author",
@@ -2652,7 +2652,7 @@ def diff_ignore_whitespace(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None,)
# only whitespace changes, should return no changes
svntest.main.file_write(file_path,
@@ -2698,7 +2698,7 @@ def diff_ignore_eolstyle(sbox):
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# commit only eol changes
svntest.main.file_write(file_path,
@@ -2746,7 +2746,7 @@ def diff_in_renamed_folder(sbox):
### child of the A/D/C copy. thus, it appears in the status output as a
### (M)odified child.
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
expected_output = svntest.wc.State(wc_dir, {
'A/D/C/kappa' : Item(verb='Sending'),
@@ -2756,7 +2756,7 @@ def diff_in_renamed_folder(sbox):
for i in range(3, 5):
svntest.main.file_append(kappa_path, str(i) + "\n")
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
expected_output = make_diff_header(kappa_path, "revision 3",
"revision 4") + [
@@ -2906,7 +2906,7 @@ def diff_ignore_eolstyle_empty_lines(sbo
'iota' : Item(verb='Sending'),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- None, None, wc_dir)
+ None)
# sleep to guarantee timestamp change
time.sleep(1.1)
@@ -3013,7 +3013,7 @@ def diff_summarize_xml(sbox):
[], wc_dir, paths, items, props, kinds, wc_dir)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# 1) Test --xml without --summarize
svntest.actions.run_and_verify_svn(
@@ -3402,7 +3402,7 @@ def diff_prop_missing_context(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
prop_val = "".join([
"line 3\n",
@@ -3459,7 +3459,7 @@ def diff_prop_multiple_hunks(sbox):
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('iota', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
prop_val = "".join([
"line 1\n",
@@ -3523,7 +3523,7 @@ def diff_git_empty_files(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
svntest.main.file_write(new_path, "")
svntest.main.run_svn(None, 'add', new_path)
@@ -3560,7 +3560,7 @@ def diff_git_with_props(sbox):
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
svntest.main.file_write(new_path, "")
svntest.main.run_svn(None, 'add', new_path)
@@ -3602,7 +3602,7 @@ def diff_correct_wc_base_revnum(sbox):
'iota' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
# Child's base is now 2; parent's is still 1.
# Make a local mod.
@@ -3641,7 +3641,7 @@ def diff_git_with_props_on_dir(sbox):
sbox.simple_propset('k','v', '', 'A')
svntest.actions.run_and_verify_commit(wc_dir, expected_output,
- expected_status, None, wc_dir)
+ expected_status)
was_cwd = os.getcwd()
os.chdir(wc_dir)
@@ -4371,7 +4371,7 @@ def diff_repos_empty_file_addition(sbox)
'newfile' : Item(status=' ', wc_rev=2),
})
svntest.actions.run_and_verify_commit(sbox.wc_dir, expected_output,
- expected_status, None, sbox.wc_dir)
+ expected_status)
# Now diff the revision that added the empty file.
expected_output = [
Modified: subversion/trunk/subversion/tests/cmdline/entries_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/entries_tests.py Fri Feb 27
18:57:57 2015
@@ -102,7 +102,7 @@ def basic_entries(sbox):
expected_status.tweak('A/B/E/beta', wc_rev=2)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
- None,
+ [],
alpha_path, beta_path)
# bump 'G' and iota another revision (3) for later testing
@@ -117,7 +117,7 @@ def basic_entries(sbox):
expected_status.tweak('A/D/G', 'iota', wc_rev=3)
svntest.actions.run_and_verify_commit(wc_dir,
expected_output, expected_status,
- None,
+ [],
G_path, iota_path)
# Add a file over the DELETED 'alpha'. It should be schedule-add.
