Author: rhuijben
Date: Fri Feb 27 22:37:13 2015
New Revision: 1662838
URL: http://svn.apache.org/r1662838
Log:
Following up on r1662794, make the checkout/switch/update logic in the python
test framework use the standard run_and_verify_svn stderr handling, and replace
the 4 singleton arguments of these functions with a completely optional
extra_files args (which handles the only current usage in a better way than
before), that verifies that these files are actually there.
In one case we still installed a singleton handler to allow extra files,
but found no files since the introduction of tree conflicts. (Probably 1.6.0)
The new code would return failure because the files are not here.
* subversion/tests/cmdline/authz_tests.py
* subversion/tests/cmdline/basic_tests.py
* subversion/tests/cmdline/changelist_tests.py
* subversion/tests/cmdline/checkout_tests.py
* subversion/tests/cmdline/copy_tests.py
* subversion/tests/cmdline/depth_tests.py
* subversion/tests/cmdline/diff_tests.py
* subversion/tests/cmdline/externals_tests.py
* subversion/tests/cmdline/import_tests.py
* subversion/tests/cmdline/info_tests.py
* subversion/tests/cmdline/input_validation_tests.py
* subversion/tests/cmdline/log_tests.py
* subversion/tests/cmdline/merge_authz_tests.py
* subversion/tests/cmdline/merge_automatic_tests.py
* subversion/tests/cmdline/merge_reintegrate_tests.py
* subversion/tests/cmdline/merge_tests.py
* subversion/tests/cmdline/merge_tree_conflict_tests.py
* subversion/tests/cmdline/move_tests.py
* subversion/tests/cmdline/prop_tests.py
* subversion/tests/cmdline/resolve_tests.py
* subversion/tests/cmdline/revert_tests.py
* subversion/tests/cmdline/special_tests.py
* subversion/tests/cmdline/stat_tests.py
* subversion/tests/cmdline/svnversion_tests.py
* subversion/tests/cmdline/switch_tests.py
* subversion/tests/cmdline/trans_tests.py
* subversion/tests/cmdline/tree_conflict_tests.py
* subversion/tests/cmdline/update_tests.py
* subversion/tests/cmdline/wc_tests.py
(*): Update caller. Simplify commands where possible. Tried not to
introduce behavior changes.
* subversion/tests/cmdline/svntest/actions.py
(run_and_verify_checkout2,
run_and_verify_checkout): Remove several arguments. Add dynamic keywords.
Update caller.
(verify_update): Define extra_files. Forward to disk comparison.
(verify_disk): If extra_files is set, set singleton handlers and a (new)
done handler. If needed we can add other tests this way.
(run_and_verify_update,
run_and_verify_merge): Remove some arguments. Add dynamic keywords.
Use run_and_verify_svn.
(run_and_verify_patch): Add dynamic keyword support.
(run_and_verify_switch,
run_and_verify_commit): Remove some arguments. Add dynamic keywords.
Use run_and_verify_svn.
(build_greek_tree_conflicts): Update caller.
* subversion/tests/cmdline/svntest/deeptrees.py
(deep_trees_run_tests_scheme_for_update,
deep_trees_skipping_on_update,
deep_trees_run_tests_scheme_for_switch,
deep_trees_run_tests_scheme_for_merge,
do_routine_switching): Update caller. Convert None error to [].
* subversion/tests/cmdline/svntest/factory.py
(TestFactory): Update templates.
* subversion/tests/cmdline/svntest/mergetrees.py
(set_up_dir_replace): Update caller.
* subversion/tests/cmdline/svntest/tree.py
(detect_conflict_files_done): New function.
Modified:
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/changelist_tests.py
subversion/trunk/subversion/tests/cmdline/checkout_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/externals_tests.py
subversion/trunk/subversion/tests/cmdline/import_tests.py
subversion/trunk/subversion/tests/cmdline/info_tests.py
subversion/trunk/subversion/tests/cmdline/input_validation_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_automatic_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/move_tests.py
subversion/trunk/subversion/tests/cmdline/prop_tests.py
subversion/trunk/subversion/tests/cmdline/resolve_tests.py
subversion/trunk/subversion/tests/cmdline/revert_tests.py
subversion/trunk/subversion/tests/cmdline/special_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py
subversion/trunk/subversion/tests/cmdline/svntest/factory.py
subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py
subversion/trunk/subversion/tests/cmdline/svntest/tree.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
subversion/trunk/subversion/tests/cmdline/wc_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=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/authz_tests.py Fri Feb 27
22:37:13 2015
@@ -390,9 +390,9 @@ def authz_checkout_test(sbox):
expected_wc = svntest.main.greek_state
svntest.actions.run_and_verify_checkout(sbox.repo_url,
- local_dir,
- expected_output,
- expected_wc)
+ local_dir,
+ expected_output,
+ expected_wc)
@Skip(svntest.main.is_ra_type_file)
def authz_checkout_and_update_test(sbox):
@@ -454,9 +454,7 @@ def authz_checkout_and_update_test(sbox)
expected_output,
expected_wc,
expected_status,
- None,
- None, None,
- None, None, 1)
+ [], True)
@Skip(svntest.main.is_ra_type_file)
def authz_partial_export_test(sbox):
@@ -1231,7 +1229,7 @@ def authz_tree_conflict(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None, 0,
+ [], False,
'-r', '1', wc_dir)
@Issue(3900)
@@ -1430,9 +1428,7 @@ def remove_subdir_with_authz_and_tc(sbox
expected_output,
None,
expected_status,
- None,
- None, None,
- None, None, False,
+ [], False,
wc_dir, '-r', '1')
# Perform some edit operation to introduce a tree conflict
@@ -1447,11 +1443,7 @@ def remove_subdir_with_authz_and_tc(sbox
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
None,
- None,
- None,
- None, None,
- None, None, False,
- wc_dir)
+ None)
@SkipUnless(svntest.main.is_ra_type_svn)
def authz_svnserve_groups(sbox):
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Fri Feb 27
22:37:13 2015
@@ -496,9 +496,7 @@ def basic_update_corruption(sbox):
fail_output,
expected_disk,
fail_status,
- "svn: E155017: Checksum",
- None, None, None, None,
- None, other_wc)
+ "svn: E155017: Checksum")
# Restore the uncorrupted text base.
os.chmod(tb_dir_path, 0777)
@@ -706,9 +704,7 @@ def basic_conflict(sbox):
expected_output,
expected_disk,
expected_status,
- None,
- svntest.tree.detect_conflict_files,
- extra_files)
+ extra_files=extra_files)
# verify that the extra_files list is now empty.
if len(extra_files) != 0:
@@ -976,7 +972,7 @@ def basic_switch(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
+ [],
False, '--ignore-ancestry')
### Switch the directory `A/D/H' to `A/D/G'.
@@ -1036,7 +1032,7 @@ def basic_switch(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
+ [],
False, '--ignore-ancestry')
#----------------------------------------------------------------------
@@ -1409,8 +1405,7 @@ def basic_import(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1)
+ [], True)
#----------------------------------------------------------------------
@@ -2275,21 +2270,7 @@ def automatic_conflict_resolution(sbox):
expected_output,
expected_disk,
expected_status,
- None,
- svntest.tree.detect_conflict_files,
- extra_files)
-
- # verify that the extra_files list is now empty.
- if len(extra_files) != 0:
- # Because we want to be a well-behaved test, we silently raise if
- # the test fails. However, these two print statements would
- # probably reveal the cause for the failure, if they were
- # uncommented:
- #
- # logger.warn("Not all extra reject files have been accounted for:")
- # logger.warn(extra_files)
- ### we should raise a less generic error here. which?
- raise svntest.Failure
+ extra_files=extra_files)
# So now lambda, mu and rho are all in a "conflicted" state. Run 'svn
# resolve' with the respective "--accept[mine|orig|repo]" flag.
@@ -2377,9 +2358,7 @@ def automatic_conflict_resolution(sbox):
expected_output,
expected_disk,
expected_status,
- None,
- svntest.tree.detect_conflict_files,
- extra_files)
+ extra_files=extra_files)
def info_nonexisting_file(sbox):
"get info on a file not in the repo"
Modified: subversion/trunk/subversion/tests/cmdline/changelist_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/changelist_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/changelist_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/changelist_tests.py Fri Feb 27
22:37:13 2015
@@ -814,8 +814,7 @@ def update_with_changelists(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1,
+ [], True,
"-r", "1",
"--changelist", "a",
"--changelist", "i",
@@ -856,8 +855,7 @@ def update_with_changelists(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1,
+ [], True,
"-r", "1",
"--changelist", "a",
"--changelist", "i",
Modified: subversion/trunk/subversion/tests/cmdline/checkout_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/checkout_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/checkout_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/checkout_tests.py Fri Feb 27
22:37:13 2015
@@ -207,7 +207,7 @@ def checkout_with_obstructions(sbox):
'A/D/H', 'A/D/H/psi', 'A/D/H/omega', 'A/D/H/chi', 'A/D/gamma', 'A/C')
actions.run_and_verify_checkout2(False, url, wc_dir, expected_output,
- expected_disk, None, None, None, None)
+ expected_disk)
# svn status
expected_status = actions.get_virginal_state(wc_dir, 1)
@@ -243,7 +243,7 @@ def checkout_with_obstructions(sbox):
expected_status = actions.get_virginal_state(wc_dir, 1)
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status,)
@@ -291,7 +291,7 @@ def forced_checkout_of_file_with_dir_obs
expected_disk.tweak('iota', contents=None)
actions.run_and_verify_checkout(url, wc_dir_other, expected_output,
- expected_disk, None, None, None, None, '--force')
+ expected_disk, [], '--force')
#----------------------------------------------------------------------
@@ -356,7 +356,7 @@ def forced_checkout_of_dir_with_file_obs
expected_disk.tweak('A', contents='The file A\n')
actions.run_and_verify_checkout(url, wc_dir_other, expected_output,
- expected_disk, None, None, None, None, '--force')
+ expected_disk, [], '--force')
# Now see to it that we can recover from the obstructions.
@@ -374,7 +374,7 @@ def forced_checkout_of_dir_with_file_obs
svntest.main.run_svn(None, 'revert', '-R', os.path.join(wc_dir_other, 'A'))
actions.run_and_verify_update(wc_dir_other, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir_other)
+ expected_status)
#----------------------------------------------------------------------
@@ -390,8 +390,7 @@ def forced_checkout_with_faux_obstructio
svntest.actions.run_and_verify_checkout(sbox.repo_url,
sbox.wc_dir, expected_output,
- expected_wc, None, None, None,
- None, '--force')
+ expected_wc, [], '--force')
#----------------------------------------------------------------------
@@ -411,8 +410,7 @@ def forced_checkout_with_real_obstructio
svntest.actions.run_and_verify_checkout(sbox.repo_url,
sbox.wc_dir, expected_output,
- expected_wc, None, None, None,
- None, '--force')
+ expected_wc, [], '--force')
#----------------------------------------------------------------------
@@ -436,8 +434,7 @@ def forced_checkout_with_real_obstructio
svntest.actions.run_and_verify_checkout(sbox.repo_url,
sbox.wc_dir, expected_output,
- expected_wc, None, None, None,
- None, '--force')
+ expected_wc, [], '--force')
#----------------------------------------------------------------------
@@ -481,8 +478,7 @@ def forced_checkout_with_versioned_obstr
expected_wc = svntest.main.greek_state.copy()
svntest.actions.run_and_verify_checkout(repo_url, fresh_wc_dir,
expected_output, expected_wc,
- None, None, None, None,
- '--force')
+ [], '--force')
# Checkout the entire first repos into the other dir. This should
# fail because it's a different repository.
@@ -493,8 +489,7 @@ def forced_checkout_with_versioned_obstr
expected_wc = svntest.main.greek_state.copy()
svntest.actions.run_and_verify_checkout(repo_url, other_wc_dir,
expected_output, expected_wc,
- None, None, None, None,
- '--force')
+ [], '--force')
#ensure that other_wc_dir_A is not affected by this forced checkout.
svntest.actions.run_and_verify_svn(None,
@@ -573,8 +568,7 @@ def import_and_checkout(sbox):
svntest.actions.run_and_verify_checkout(other_repo_url, import_from_dir,
expected_output, expected_wc,
- None, None, None, None,
- '--force')
+ [], '--force')
#----------------------------------------------------------------------
# Issue #2529.
@@ -895,9 +889,8 @@ def co_with_obstructing_local_adds(sbox)
# wc_backup before performing the checkout otherwise.
svntest.actions.run_and_verify_checkout(sbox.repo_url, wc_backup,
expected_output, expected_disk,
- svntest.tree.detect_conflict_files,
- extra_files, None, None,
- '--force')
+ [], '--force',
+ extra_files=extra_files)
svntest.actions.run_and_verify_status(wc_backup, expected_status)
@@ -1001,8 +994,7 @@ def co_with_obstructing_local_adds(sbox)
D_path,
expected_output,
expected_disk,
- None, None, None, None,
- '--force')
+ [], '--force')
expected_status.tweak('A/D/M', treeconflict='C', status='R ')
expected_status.tweak(
@@ -1041,8 +1033,7 @@ def co_with_obstructing_local_adds(sbox)
F_path,
expected_output,
expected_disk,
- None, None, None, None,
- '--force')
+ [], '--force')
expected_status.tweak('A/B/F/omicron', treeconflict='C', status='R ')
expected_status.add({
@@ -1122,8 +1113,7 @@ def checkout_wc_from_drive(sbox):
'iota' : Item(status='A '),
})
svntest.actions.run_and_verify_checkout(repo_url, wc_dir,
- expected_output, expected_wc,
- None, None, None, None)
+ expected_output, expected_wc)
wc2_dir = sbox.add_wc_path('2')
expected_output = wc.State(wc2_dir, {
@@ -1164,8 +1154,7 @@ def checkout_wc_from_drive(sbox):
})
svntest.actions.run_and_verify_checkout(repo_url + '/A', wc2_dir,
- expected_output, expected_wc,
- None, None, None, None)
+ expected_output, expected_wc)
wc3_dir = sbox.add_wc_path('3')
expected_output = wc.State(wc3_dir, {
@@ -1191,8 +1180,7 @@ def checkout_wc_from_drive(sbox):
})
svntest.actions.run_and_verify_checkout(repo_url + '/A/D', wc3_dir,
- expected_output, expected_wc,
- None, None, None, None)
+ expected_output, expected_wc)
finally:
os.chdir(was_cwd)
Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Fri Feb 27 22:37:13
2015
@@ -3951,9 +3951,9 @@ def path_move_and_copy_between_wcs_2475(
# Do a checkout, and verify the resulting output and disk contents.
svntest.actions.run_and_verify_checkout(repo_url2,
- wc2_dir,
- expected_output,
- expected_wc)
+ wc2_dir,
+ expected_output,
+ expected_wc)
# Copy a file from wc to wc2
mu_path = sbox.ospath('A/mu')
@@ -4697,8 +4697,7 @@ def mixed_rev_copy_del(sbox):
expected_status.tweak('A/B/E/beta', wc_rev=1)
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
- expected_status, [],
- None, None, None, None, None,
+ expected_status, [], False,
'-r1',
sbox.ospath('A/B/E/alpha'),
sbox.ospath('A/B/E/beta'))
@@ -5010,7 +5009,7 @@ def copy_wc_url_with_absent(sbox):
expected_output,
None,
None,
- None, None, None, None, None, False,
+ [], False,
wc_dir, '--set-depth', 'infinity')
# Except for A/no, the 3 directories should now have the same children
Modified: subversion/trunk/subversion/tests/cmdline/depth_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/depth_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/depth_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/depth_tests.py Fri Feb 27
22:37:13 2015
@@ -193,8 +193,7 @@ def depth_empty_update_bypass_single_fil
svntest.actions.run_and_verify_update(wc_empty,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
# And the wc should still be depth-empty.
verify_depth(None, "empty", wc_empty)
@@ -205,7 +204,7 @@ def depth_empty_update_bypass_single_fil
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=infinity", wc_empty)
# And the wc should still be depth-empty.
@@ -253,8 +252,7 @@ def depth_immediates_get_top_file_mod_on
svntest.actions.run_and_verify_update(wc_immediates,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
verify_depth(None, "immediates", wc_immediates)
@@ -341,7 +339,7 @@ def depth_empty_with_file(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'-r2', wc_empty)
# Update the depth-empty wc all the way, expecting to receive the deletion
@@ -354,8 +352,7 @@ def depth_empty_with_file(sbox):
svntest.actions.run_and_verify_update(wc_empty,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
@@ -399,8 +396,7 @@ def depth_empty_with_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
A_path)
# Commit a change to A/mu in the "other" wc.
@@ -425,8 +421,7 @@ def depth_empty_with_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
A_path)
# Commit the deletion of A/mu from the "other" wc.
@@ -453,8 +448,7 @@ def depth_empty_with_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
A_path)
@@ -487,8 +481,7 @@ def depth_immediates_bring_in_file(sbox)
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, None,
+ [], False,
A_mu_path)
# Run 'svn up A/D/gamma' to test the edge case 'Skipped'.
@@ -531,8 +524,7 @@ def depth_immediates_fill_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity',
A_path)
@@ -564,8 +556,7 @@ def depth_mixed_bring_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files',
A_path)
# Check that A was added at depth=files.
@@ -592,8 +583,7 @@ def depth_mixed_bring_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates',
B_path)
# Check that A/B was added at depth=immediates.
@@ -617,8 +607,7 @@ def depth_mixed_bring_in_dir(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty',
C_path)
# Check that A/C was added at depth=empty.
@@ -651,8 +640,7 @@ def depth_empty_unreceive_delete(sbox):
svntest.actions.run_and_verify_update(wc_empty,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
@@ -691,8 +679,7 @@ def depth_immediates_unreceive_delete(sb
svntest.actions.run_and_verify_update(wc_immed,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
def depth_immediates_receive_delete(sbox):
@@ -731,8 +718,7 @@ def depth_immediates_receive_delete(sbox
svntest.actions.run_and_verify_update(wc_immed,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
#----------------------------------------------------------------------
def depth_immediates_subdir_propset_1(sbox):
@@ -782,7 +768,7 @@ def depth_immediates_subdir_propset_1(sb
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
def depth_immediates_subdir_propset_2(sbox):
@@ -832,8 +818,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files')
verify_depth(None, "files")
@@ -854,8 +839,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates')
verify_depth(None, "immediates")
verify_depth(None, "empty", "A")
@@ -879,8 +863,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', 'A')
verify_depth(None, "immediates")
verify_depth(None, "files", "A")
@@ -911,8 +894,7 @@ def depth_update_to_more_depth(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity')
verify_depth("Non-infinity depth detected after an upgrade to
depth-infinity",
"infinity")
@@ -1193,8 +1175,7 @@ def depth_immediates_receive_new_dir(sbo
svntest.actions.run_and_verify_update(wc_immed,
expected_output,
expected_disk,
- expected_status,
- None, None, None, None, None)
+ expected_status)
# Check that the new directory was added at depth=empty.
verify_depth(None, "empty", other_I_path)
@@ -1269,8 +1250,8 @@ def upgrade_from_above(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, None,
- '--set-depth=files')
+ [], False,
+ '--set-depth=files', '.')
verify_depth(None, "files")
finally:
os.chdir(saved_cwd)
@@ -1291,7 +1272,7 @@ def upgrade_from_above(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, None,
+ [], False,
'--set-depth=files', wc)
verify_depth(None, "files", wc)
@@ -1433,8 +1414,7 @@ def depthy_update_above_dir_to_be_delete
expected_output_func(wc_dir),
expected_disk,
expected_status_func(wc_dir),
- None, None, None, None, None,
- False,
+ [], False,
"--depth=%s" % depth, wc_dir)
@@ -1479,8 +1459,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', E_path)
verify_depth(None, "immediates", E_path)
@@ -1490,8 +1469,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', E_path)
verify_depth(None, "files", E_path)
@@ -1507,8 +1485,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', B_path)
verify_depth(None, "immediates", B_path)
verify_depth(None, "empty", E_path)
@@ -1527,8 +1504,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', H_path)
verify_depth(None, "empty", H_path)
@@ -1545,8 +1521,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', D_path)
verify_depth(None, "immediates", D_path)
verify_depth(None, "empty", G_path)
@@ -1564,8 +1539,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', D_path)
verify_depth(None, "empty", D_path)
@@ -1582,8 +1556,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", C_path)
@@ -1602,8 +1575,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', A_path)
verify_depth(None, "files", A_path)
@@ -1618,8 +1590,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', A_path)
verify_depth(None, "empty", A_path)
@@ -1634,8 +1605,7 @@ def depth_folding_clean_trees_1(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', wc_dir)
verify_depth(None, "files", wc_dir)
@@ -1706,8 +1676,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', D_path)
verify_depth(None, "immediates", D_path)
verify_depth(None, "empty", G_path)
@@ -1726,8 +1695,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", D_path)
@@ -1747,8 +1715,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", D_path)
@@ -1766,8 +1733,7 @@ def depth_folding_clean_trees_2(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", D_path)
@@ -1793,8 +1759,7 @@ def depth_folding_clean_trees_2(sbox):
# expected_output,
# expected_disk,
# expected_status,
-# None, None,
-# None, None, None, None,
+# [], False,
# '--set-depth', 'empty', A_path)
def depth_fold_expand_clean_trees(sbox):
@@ -1851,8 +1816,7 @@ def depth_fold_expand_clean_trees(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', A_path)
verify_depth(None, "immediates", A_path)
verify_depth(None, "empty", B_path)
@@ -1879,8 +1843,7 @@ def depth_fold_expand_clean_trees(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', Other_A_path)
verify_depth(None, "files", Other_A_path)
@@ -1917,7 +1880,7 @@ def pull_in_tree_with_depth_option(sbox)
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=immediates", A_path)
# Check that the A directory was pull ed in at depth=immediates.
@@ -1981,8 +1944,7 @@ def fold_tree_with_unversioned_modified_
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', A_path)
verify_depth(None, "empty", A_path)
@@ -2011,7 +1973,7 @@ def depth_empty_update_on_file(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--depth=empty', '-r1', iota_path)
# Check the revision and created rev.
@@ -2047,8 +2009,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', E_path)
# verify_depth exclude? not implemented yet
@@ -2066,8 +2027,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', B_path)
verify_depth(None, "immediates", B_path)
@@ -2085,8 +2045,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', B_path)
# Explicitly pull in excluded path B.
@@ -2104,8 +2063,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
B_path)
# Test issue #
@@ -2119,8 +2077,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', iota_path)
# Update the whole WC to depth=infinity.
@@ -2136,8 +2093,7 @@ def excluded_path_update_operation(sbox)
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity', wc_dir)
def excluded_path_misc_operation(sbox):
@@ -2165,8 +2121,7 @@ def excluded_path_misc_operation(sbox):
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', E_path)
# copy A/B to A/L, excluded entry should be copied too
@@ -2254,8 +2209,7 @@ def excluded_receive_remote_removal(sbox
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
"--set-depth", "exclude", B_path)
# Remove path B in the repos.
@@ -2270,9 +2224,7 @@ def excluded_receive_remote_removal(sbox
svntest.actions.run_and_verify_update(wc,
None,
expected_disk,
- expected_status,
- None, None,
- None, None, None, None)
+ expected_status)
# Introduce a new path with the same name B.
# This should succeed if the exclude entry is gone with the update,
@@ -2387,7 +2339,7 @@ def make_depth_tree_conflicts(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'-r1', A)
# Perform node deletions so that items become unversioned and
@@ -2429,7 +2381,7 @@ def make_depth_tree_conflicts(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
wc)
@@ -2509,8 +2461,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'exclude', B_path)
# Update to depth 'empty' for the excluded path A/B
@@ -2527,8 +2478,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'empty', B_path)
verify_depth(None, "empty", B_path)
expected_info = {
@@ -2560,8 +2510,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'files', B_path)
verify_depth(None, "files", B_path)
expected_info = {
@@ -2599,8 +2548,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'immediates', B_path)
verify_depth(None, "immediates", B_path)
expected_info = {
@@ -2630,8 +2578,7 @@ def update_excluded_path_sticky_depths(s
expected_output,
expected_disk,
expected_status,
- None, None,
- None, None, None, None,
+ [], False,
'--set-depth', 'infinity', B_path)
verify_depth(None, "infinity", B_path)
expected_info = {
@@ -2677,9 +2624,7 @@ def update_depth_empty_root_of_infinite_
svntest.actions.run_and_verify_update(wc_dir,
expected_output,
expected_disk,
- expected_status,
- None, None,
- None, None, None, None, wc_dir)
+ expected_status)
def sparse_update_with_dash_dash_parents(sbox):
"""update --parents"""
@@ -2719,7 +2664,7 @@ def sparse_update_with_dash_dash_parents
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--parents', alpha_path)
expected_output = svntest.wc.State(sbox.wc_dir, {
@@ -2741,7 +2686,7 @@ def sparse_update_with_dash_dash_parents
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--parents', pi_path)
expected_output = svntest.wc.State(sbox.wc_dir, {
@@ -2760,7 +2705,7 @@ def sparse_update_with_dash_dash_parents
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
'--parents', omega_path)
def update_below_depth_empty(sbox):
@@ -2777,8 +2722,8 @@ def update_below_depth_empty(sbox):
'A/D' : Item(status='D '),
})
svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None,
- None, None, None, None, None, None,
- False,
+ None,
+ [], False,
'--set-depth', 'empty', A)
svntest.actions.run_and_verify_svn(None, [],
@@ -2791,7 +2736,7 @@ def update_below_depth_empty(sbox):
# This update should just update the revision of the working copy
svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None,
- None, None)
+ None)
# Test for issue #4136.
@Issue(4136)
@@ -2828,7 +2773,7 @@ def commit_then_immediates_update(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=immediates", wc_dir)
def revert_depth_files(sbox):
@@ -2869,7 +2814,7 @@ def spurious_nodes_row(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--depth=empty", sbox.wc_dir)
val2 = svntest.wc.sqlite_stmt(sbox.wc_dir, "select count(*) from nodes")
if (val1 != val2):
@@ -2892,7 +2837,7 @@ def commit_excluded(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--set-depth=exclude",
sbox.ospath('A/D/G'))
@@ -2949,7 +2894,7 @@ def commit_excluded(sbox):
expected_output,
None,
expected_status,
- None, None, None, None, None, False,
+ [], False,
"--set-depth=infinity", wc_dir)
#----------------------------------------------------------------------
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Fri Feb 27 22:37:13
2015
@@ -729,8 +729,7 @@ def dont_diff_binary_file(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- 1) # verify props, too.
+ check_props=True)
# Make a local mod to the binary file.
svntest.main.file_append(theta_path, "some extra junk")
@@ -4418,8 +4417,8 @@ def diff_missing_tree_conflict_victim(sb
expected_disk,
expected_status,
expected_skip,
- None, None, None, None, None, None,
- False, '--ignore-ancestry', wc_dir)
+ [], False, False,
+ '--ignore-ancestry', wc_dir)
# 'svn diff' should show no change for the working copy
# This currently fails because svn errors out with a 'node not found' error
Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Fri Feb 27
22:37:13 2015
@@ -1244,8 +1244,7 @@ def binary_file_externals(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
#----------------------------------------------------------------------
@@ -1289,8 +1288,7 @@ def update_lose_file_external(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
# now remove the svn:external prop
svntest.actions.run_and_verify_svn(None, [],
@@ -1326,8 +1324,7 @@ def update_lose_file_external(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
probe_paths_missing([sbox.ospath('A/C/external')])
@@ -1474,8 +1471,7 @@ def relegate_external(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
#----------------------------------------------------------------------
@@ -1542,8 +1538,7 @@ def wc_repos_file_externals(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
# Copy A/C to a new tag in the repos
tag_url = repo_url + '/A/I'
@@ -1576,8 +1571,7 @@ def wc_repos_file_externals(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
#----------------------------------------------------------------------
@SkipUnless(svntest.main.server_has_mergeinfo)
@@ -1656,8 +1650,7 @@ def update_modify_file_external(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
# Modify A/mu
svntest.main.file_append(sbox.ospath('A/mu'), 'appended mu text')
@@ -1684,8 +1677,7 @@ def update_modify_file_external(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None, None, None,
- True)
+ check_props=True)
# Test for issue #2267
@Issue(2267)
@@ -1891,8 +1883,7 @@ def exclude_externals(sbox):
# or register the file external as excluded (preferred behavior)
svntest.actions.run_and_verify_update(sbox.ospath('A/B/gamma'),
None, None, None,
- '.*Cannot exclude.*',
- None, None, None, None, False,
+ '.*Cannot exclude.*', False,
'--set-depth', 'exclude',
sbox.ospath('A/B/gamma'))
@@ -1900,8 +1891,7 @@ def exclude_externals(sbox):
# or register the directory external as excluded (preferred behavior)
svntest.actions.run_and_verify_update(sbox.ospath('A/C/exdir_G'),
None, None, None,
- '.*Cannot exclude.*',
- None, None, None, None, False,
+ '.*Cannot exclude.*', False,
'--set-depth', 'exclude',
sbox.ospath('A/C/exdir_G'))
@@ -1958,8 +1948,8 @@ def exclude_externals(sbox):
'A/D/x/y/z/blah/F' : Item(status=' ', wc_rev='5'),
})
svntest.actions.run_and_verify_update(wc_dir,
- None, None, expected_status, None,
- None, None, None, None, False,
+ None, None, expected_status,
+ [], False,
'--set-depth', 'infinity', wc_dir)
def file_externals_different_url(sbox):
@@ -2002,7 +1992,7 @@ def file_externals_different_url(sbox):
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
- expected_status, None)
+ expected_status)
# Verify that all file external URLs are descendants of r1_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
@@ -2020,7 +2010,7 @@ def file_externals_different_url(sbox):
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None,
- expected_status, None)
+ expected_status)
# Verify that all file external URLs are descendants of r2_url
for e in ['r1-e-1', 'r1-e-2', 'r2-e-1', 'r2-e-2', 'rr-e-1']:
@@ -2127,7 +2117,7 @@ def copy_file_externals(sbox):
expected_status.tweak(wc_rev='2')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# have a commit on one of the files
# echo mod >> X/xmu
@@ -2154,7 +2144,7 @@ def copy_file_externals(sbox):
expected_status.tweak(wc_rev='3')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# now perform the WC->WC copy
# svn cp X X_copy
@@ -2201,7 +2191,7 @@ def copy_file_externals(sbox):
expected_status.tweak(wc_rev='4')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, True, wc_dir)
+ expected_status, check_props=True)
def commit_include_externals(sbox):
"commit --include-externals"
@@ -2293,7 +2283,7 @@ def commit_include_externals(sbox):
expected_status.tweak(wc_rev='2')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# svn ps svn:externals "^/Z xZ" A/D/H
expected_stdout = ["property 'svn:externals' set on '" + A_D_H + "'\n"]
@@ -2449,7 +2439,7 @@ def commit_include_externals(sbox):
expected_status.tweak('Xpegged/xiota', wc_rev='1')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# echo mod >> Xpegged/xE/alpha
main.file_append(Xpegged_xE_alpha, 'mod\n')
@@ -2545,7 +2535,7 @@ def commit_include_externals(sbox):
'Xpegged/xE/beta', wc_rev=1)
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# new mods to check more cases
# echo mod >> X/xmu
@@ -2617,7 +2607,7 @@ def commit_include_externals(sbox):
expected_status.tweak('X/Y/xH/chi', status='M ')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# echo mod >> X/xG/pi
main.file_append(X_xG_pi, 'mod\n')
@@ -2702,7 +2692,7 @@ def include_immediate_dir_externals(sbox
expected_status.tweak(wc_rev='2')
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# svn ps svn:externals "^/A/B/E X/XE" wc_dir
expected_stdout = ["property 'svn:externals' set on '" + wc_dir + "'\n"]
@@ -2739,7 +2729,7 @@ def include_immediate_dir_externals(sbox
})
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
sbox.simple_propset('some', 'change', 'X/XE')
@@ -2897,7 +2887,7 @@ def dir_external_with_dash_r_only(sbox):
})
actions.run_and_verify_update(wc_dir, expected_output, expected_disk,
- expected_status, None, None, None, None, None, False, wc_dir)
+ expected_status)
# svn info E_ext/alpha
expected_info = { 'Revision': '1' }
@@ -3191,7 +3181,7 @@ def update_dir_external_shallow(sbox):
})
svntest.actions.run_and_verify_update(sbox.wc_dir,
expected_output, None, None,
- None, None, None, None, None, False,
+ [], False,
'--set-depth=empty',
sbox.ospath('A/B/E'))
@@ -3205,7 +3195,7 @@ def update_dir_external_shallow(sbox):
})
svntest.actions.run_and_verify_update(sbox.wc_dir,
expected_output, None, None,
- None, None, None, None, None, False,
+ [], False,
'--set-depth=infinity',
sbox.ospath('A/B/E'))
@@ -3523,7 +3513,7 @@ def replace_tree_with_foreign_external(s
})
svntest.actions.run_and_verify_update(wc_dir,
expected_output, None, expected_status,
- None, None, None, None, None, 1,
+ [], True,
'-r', '2', wc_dir)
@@ -4026,7 +4016,7 @@ def copy_pin_externals_whitepace_dir(sbo
'branches/wc-wc/ext/A P R/about' : Item(status=' ', wc_rev='4'),
})
svntest.actions.run_and_verify_update(wc_dir + '/branches', expected_output,
- None, expected_status, [])
+ None, expected_status)
# Now let's use our existing setup to perform some copies with dynamic
# destinations
Modified: subversion/trunk/subversion/tests/cmdline/import_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/import_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/import_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/import_tests.py Fri Feb 27
22:37:13 2015
@@ -126,8 +126,7 @@ def import_executable(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
def import_ignores(sbox):
@@ -197,8 +196,7 @@ def import_ignores(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
def import_no_ignores(sbox):
@@ -272,8 +270,7 @@ def import_no_ignores(sbox):
expected_output,
expected_disk,
expected_status,
- None, None, None,
- None, None, 1)
+ check_props=True)
#----------------------------------------------------------------------
def import_avoid_empty_revision(sbox):
"avoid creating empty revisions with import"
Modified: subversion/trunk/subversion/tests/cmdline/info_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/info_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/info_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/info_tests.py Fri Feb 27 22:37:13
2015
@@ -516,7 +516,7 @@ def binary_tree_conflict(sbox):
})
svntest.actions.run_and_verify_update(iota,
expected_output, None, expected_status,
- None, None, None, None, None, False,
+ [], False,
iota, '-r', '2')
expected_info = [{
Modified: subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/input_validation_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/input_validation_tests.py Fri Feb
27 22:37:13 2015
@@ -266,14 +266,14 @@ def delete_repos_root(sbox):
svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath('A/D/G'),
repo_url,
None, None, expected_status,
- None, None, None, None, None, None,
+ [], False,
'--set-depth', 'empty',
'--ignore-ancestry')
expected_status.tweak('A/B/F', switched='S')
svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath('A/B/F'),
repo_url,
None, None, expected_status,
- None, None, None, None, None, None,
+ [], False,
'--depth', 'empty',
'--ignore-ancestry')
# Delete the wcroot (which happens to be the repository root)
Modified: subversion/trunk/subversion/tests/cmdline/log_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/log_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/log_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/log_tests.py Fri Feb 27 22:37:13
2015
@@ -1646,8 +1646,7 @@ def merge_sensitive_log_added_mergeinfo_
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Commit the merge.
expected_output = svntest.wc.State(wc_dir, {
@@ -1701,7 +1700,7 @@ def merge_sensitive_log_added_mergeinfo_
expected_elision_output,
expected_disk,
expected_status, expected_skip,
- None, None, None, None, None, 1)
+ check_props=True)
# Commit the merge.
expected_output = svntest.wc.State(wc_dir, {
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Fri Feb 27
22:37:13 2015
@@ -194,8 +194,7 @@ def mergeinfo_and_skipped_paths(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1)
+ check_props=True)
# Merge r4:8 into the restricted WC's A_COPY_2.
#
@@ -270,8 +269,7 @@ def mergeinfo_and_skipped_paths(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0)
+ check_props=True)
# Merge r5:7 into the restricted WC's A_COPY_3.
#
@@ -335,8 +333,7 @@ def mergeinfo_and_skipped_paths(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0)
+ check_props=True)
svntest.actions.run_and_verify_svn(None, [], 'revert', '--recursive',
wc_restricted)
@@ -379,8 +376,8 @@ def mergeinfo_and_skipped_paths(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0, '-c5', '-c8',
+ [], True, False,
+ '-c5', '-c8',
A_COPY_2_H_path)
# Test issue #2829 'Improve handling for skipped paths encountered
@@ -436,8 +433,7 @@ def mergeinfo_and_skipped_paths(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0)
+ check_props=True)
# Merge -r4:9 to the restricted WC's A_COPY_2/D/H.
#
@@ -483,8 +479,7 @@ def mergeinfo_and_skipped_paths(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0)
+ check_props=True)
@SkipUnless(server_has_mergeinfo)
@Issue(2876)
@@ -731,8 +726,7 @@ def reintegrate_fails_if_no_root_access(
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, True, True,
+ [], True, True,
'--reintegrate', A_path)
def diff_unauth_parent(sbox):
Modified: subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py Fri Feb
27 22:37:13 2015
@@ -980,8 +980,8 @@ def merge_to_reverse_cherry_subtree_to_m
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0, A_COPY_path)
+ [], True, False,
+ A_COPY_path)
#----------------------------------------------------------------------
# Automatic merges should notice ancestory for replaced files
@@ -1073,8 +1073,8 @@ def merge_replacement(sbox):
expected_disk,
expected_status,
expected_skip,
- None, None, None, None,
- None, 1, 0, A_path)
+ [], True, False,
+ A_path)
@SkipUnless(server_has_mergeinfo)
@Issue(4313)
