Checkout
rhuijben
committed
on 27 Feb 15
Following up on r1662794, make the checkout/switch/update logic in the python
test framework use the standard run_and_verify_svn stderr hand… Show more
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. Show less