Modified: subversion/trunk/subversion/tests/cmdline/patch_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/patch_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/patch_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/patch_tests.py Fri Feb 27 18:57:57 2015 @@ -102,7 +102,7 @@ def patch(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch @@ -377,7 +377,7 @@ def patch_offset(sbox): expected_status.tweak('A/mu', wc_rev=2) expected_status.tweak('iota', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Apply patch @@ -546,7 +546,7 @@ def patch_chopped_leading_spaces(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch @@ -716,7 +716,7 @@ def patch_strip1(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch @@ -869,7 +869,7 @@ def patch_no_index_line(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) unidiff_patch = [ "--- A/D/gamma\t(revision 1)\n", "+++ A/D/gamma\t(working copy)\n", @@ -1148,7 +1148,7 @@ def patch_reject(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) patch_file_path = make_patch_path(sbox) @@ -1219,7 +1219,7 @@ def patch_keywords(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) patch_file_path = make_patch_path(sbox) @@ -1308,7 +1308,7 @@ def patch_with_fuzz(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) unidiff_patch = [ "Index: mu\n", @@ -1444,7 +1444,7 @@ def patch_reverse(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch @@ -1943,7 +1943,7 @@ def patch_with_ignore_whitespace(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch with leading and trailing spaces removed and tabs transformed # to spaces. The patch should match and the hunks should be written to the @@ -2077,7 +2077,7 @@ def patch_replace_locally_deleted_file(s expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Locally delete mu svntest.main.run_svn(None, 'rm', mu_path) @@ -2143,7 +2143,7 @@ def patch_no_eol_at_eof(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) unidiff_patch = [ "--- iota\t(revision 1)\n", "+++ iota\t(working copy)\n", @@ -2213,7 +2213,7 @@ def patch_with_properties(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) # Apply patch unidiff_patch = [ @@ -2306,7 +2306,7 @@ def patch_same_twice(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch @@ -2491,7 +2491,7 @@ def patch_dir_properties(sbox): expected_status.tweak('', wc_rev=2) expected_status.tweak('A/B', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Apply patch unidiff_patch = [ @@ -2713,7 +2713,7 @@ def patch_prop_offset(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) # Apply patch @@ -2888,7 +2888,7 @@ def patch_prop_with_fuzz(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) unidiff_patch = [ "Index: mu\n", @@ -3072,7 +3072,7 @@ def patch_old_target_names(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch @@ -3198,7 +3198,7 @@ def patch_reverse_revert(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Apply patch @@ -3520,7 +3520,7 @@ def patch_moved_away(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) 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) # Move mu away sbox.simple_move("A/mu", "A/mu2") @@ -3681,7 +3681,7 @@ def patch_deletes_prop(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) # Apply patch unidiff_patch = [ @@ -3828,7 +3828,7 @@ def patch_reversed_add_with_props2(sbox) expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.add({'newfile' : Item(wc_rev=2, status=' ')}) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Now, we'll try to reverse-apply the very diff we just created. We # expect the original state of the working copy in r1 plus 'newfile' @@ -4019,7 +4019,7 @@ def patch_target_no_eol_at_eof(sbox): expected_status.tweak('iota', wc_rev=2) 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) unidiff_patch = [ "Index: A/mu\n", "===================================================================\n", @@ -4222,8 +4222,7 @@ def patch_change_symlink_target(sbox): expected_output = svntest.wc.State(wc_dir, { 'link' : Item(verb='Adding'), }) - 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) patch_output = [ 'U %s\n' % sbox.ospath('link'), @@ -4236,8 +4235,7 @@ def patch_change_symlink_target(sbox): expected_output = svntest.wc.State(wc_dir, { 'link' : Item(verb='Sending'), }) - 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) # r4 - Now as symlink sbox.simple_rm('link') @@ -4245,8 +4243,7 @@ def patch_change_symlink_target(sbox): expected_output = svntest.wc.State(wc_dir, { 'link' : Item(verb='Replacing'), }) - 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(patch_output, [], 'patch', patch_file_path, wc_dir)
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Fri Feb 27 18:57:57 2015 @@ -133,9 +133,7 @@ def commit_props(sbox): # Commit the one file. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) @@ -169,16 +167,14 @@ def update_props(sbox): # Commit property mods svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Add more properties sbox.simple_propset('blue2', 'azul2', 'A/mu') sbox.simple_propset('red2', 'rojo2', 'A/D/H') expected_status.tweak('A/mu', 'A/D/H', wc_rev=3, status=' ') 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 = svntest.wc.State(wc_backup, { @@ -243,8 +239,7 @@ def downdate_props(sbox): # Commit the one file. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Make some mod (something to commit) svntest.main.file_append(mu_path, "some mod") @@ -261,8 +256,7 @@ def downdate_props(sbox): # Commit the one file. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Create expected output tree for an update. expected_output = svntest.wc.State(wc_dir, { @@ -313,8 +307,7 @@ def remove_props(sbox): # Commit the one file. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) #---------------------------------------------------------------------- @@ -404,8 +397,7 @@ def commit_conflict_dirprops(sbox): sbox.simple_propset('foo', 'eek', '') svntest.actions.run_and_verify_commit(wc_dir, None, None, - "[oO]ut[- ]of[- ]date", - wc_dir) + ".*[oO]ut[- ]of[- ]date.*") #---------------------------------------------------------------------- @@ -464,8 +456,7 @@ def commit_replacement_props(sbox): expected_status.tweak('A/B/lambda', wc_rev=3, status=' ') svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) #---------------------------------------------------------------------- @@ -1001,9 +992,7 @@ def binary_props(sbox): # Commit the propsets. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # Create expected output, disk, and status trees for an update of # the wc_backup. @@ -1268,8 +1257,7 @@ def update_props_on_wc_root(sbox): # Commit the working copy 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 = svntest.wc.State(wc_backup, { @@ -1527,8 +1515,7 @@ def remove_custom_ns_props(sbox): # Commit the one file. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Create expected trees for the update. expected_output = svntest.wc.State(wc_backup, { @@ -2316,7 +2303,7 @@ def file_matching_dir_prop_reject(sbox): 'A/dir_conflicts' : Item(status=' ', wc_rev=2), }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Modify/commit property change sbox.simple_propset('prop', 'val2', 'A/dir_conflicts') @@ -2327,7 +2314,7 @@ def file_matching_dir_prop_reject(sbox): }) expected_status.tweak('A', 'A/dir_conflicts', wc_rev=3) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Local property mod sbox.simple_propset('prop', 'val3', 'A/dir_conflicts') @@ -2728,8 +2715,7 @@ def dir_prop_conflict_details(sbox): svntest.actions.run_and_verify_commit(wc_dir, None, None, - '.*[Oo]ut of date.*', - wc_dir) + '.*[Oo]ut of date.*') expected_output = svntest.wc.State(wc_dir, { 'A' : Item(status=' C'), Modified: subversion/trunk/subversion/tests/cmdline/relocate_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/relocate_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/relocate_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/relocate_tests.py Fri Feb 27 18:57:57 2015 @@ -61,8 +61,7 @@ def relocate_deleted_missing_copied(sbox }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Remove A/B/F to create a missing entry svntest.main.safe_rmtree(os.path.join(wc_dir, 'A', 'B', 'F')) @@ -141,8 +140,7 @@ def relocate_deleted_missing_copied(sbox status=' ', wc_rev='3', copied=None) expected_status.remove('A/D2/G', 'A/D2/G/pi', 'A/D2/G/rho', 'A/D2/G/tau') svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir) + expected_output, expected_status) #---------------------------------------------------------------------- @@ -245,8 +243,7 @@ def relocate_and_propset(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. @@ -258,8 +255,7 @@ def relocate_and_propset(sbox): svntest.actions.run_and_verify_commit(wc_dir, None, None, - "[Oo]ut.of.date", - wc_dir) + ".*[Oo]ut of date.*") #---------------------------------------------------------------------- @@ -330,8 +326,7 @@ def relocate_with_switched_children(sbox # This won't actually do a commit, because nothing should be modified. svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir) + expected_output, expected_status) # Check the URLs of various nodes. info_output = { Modified: subversion/trunk/subversion/tests/cmdline/resolve_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolve_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Fri Feb 27 18:57:57 2015 @@ -303,9 +303,7 @@ def resolved_on_wc_root(sbox): svntest.actions.run_and_verify_commit(wc, expected_output, - expected_status, - None, - wc) + expected_status) # Go back to rev 1 expected_output = svntest.wc.State(wc, { @@ -469,9 +467,7 @@ def resolved_on_deleted_item(sbox): svntest.actions.run_and_verify_commit(wc, expected_output, - expected_status, - None, - wc) + expected_status) # Delete the paths in the second directory. svntest.actions.run_and_verify_svn(None, [], @@ -490,7 +486,7 @@ def resolved_on_deleted_item(sbox): svntest.actions.run_and_verify_commit(wc, expected_output, expected_status, - None, + [], A2) # Now merge A to A2, creating conflicts... Modified: subversion/trunk/subversion/tests/cmdline/revert_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/revert_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri Feb 27 18:57:57 2015 @@ -91,8 +91,7 @@ def revert_replacement_with_props(sbox, 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) @@ -303,8 +302,8 @@ def revert_reexpand_keyword(sbox): # This commit fails because newfile2_path is missing, but only after # we call svn_wc__internal_file_modified_p() on new_file. - svntest.actions.run_and_verify_commit(wc_dir, None, None, "2' is scheduled"+ - " for addition, but is missing", + svntest.actions.run_and_verify_commit(wc_dir, None, None, ".*2' is scheduled"+ + " for addition, but is missing.*", newfile_path, newfile2_path, '-m', "Shouldn't be committed") @@ -339,7 +338,7 @@ def revert_replaced_file_without_props(s }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # delete file1 svntest.actions.run_and_verify_svn(None, [], 'rm', file1_path) @@ -444,8 +443,7 @@ def revert_file_merge_replace_with_histo # Commit rev 2 svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # create new rho file svntest.main.file_write(rho_path, "new rho\n") @@ -463,7 +461,7 @@ def revert_file_merge_replace_with_histo svntest.actions.run_and_verify_commit(wc_dir, expected_output, - None, None, wc_dir) + None) # Update working copy expected_output = svntest.wc.State(wc_dir, {}) @@ -713,8 +711,7 @@ def revert_replaced_with_history_file_1( }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # update the working copy svntest.main.run_svn(None, 'up', wc_dir) @@ -754,8 +751,7 @@ def revert_replaced_with_history_file_1( }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Verify the content of 'mu' svntest.actions.run_and_verify_svn(text_r1, [], 'cat', mu_path) @@ -821,8 +817,7 @@ def status_of_missing_dir_after_revert_r }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # copy A/D/G from A/B/E and commit E_path = os.path.join(wc_dir, "A", "B", "E") @@ -837,8 +832,7 @@ def status_of_missing_dir_after_revert_r }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # update the working copy svntest.main.run_svn(None, 'up', wc_dir) @@ -928,8 +922,7 @@ def revert_replaced_with_history_file_2( expected_status.tweak('A/mu', status=' ', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) #---------------------------------------------------------------------- @@ -1170,8 +1163,7 @@ def revert_permissions_only(sbox): expected_status.tweak('A/B/E/beta', wc_rev='2') svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) os.chmod(sbox.ospath('A/B/E/alpha'), 0666) # not read-only is_writable(sbox.ospath('A/B/E/alpha')) Modified: subversion/trunk/subversion/tests/cmdline/schedule_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/schedule_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/schedule_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/schedule_tests.py Fri Feb 27 18:57:57 2015 @@ -495,8 +495,7 @@ def delete_missing(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) #---------------------------------------------------------------------- # Regression test for issue #854: @@ -721,8 +720,7 @@ def replace_dir_delete_child(sbox): svntest.actions.run_and_verify_commit(sbox.wc_dir, expected_output, - expected_status, - None, sbox.wc_dir) + expected_status) ######################################################################## Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/special_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/special_tests.py Fri Feb 27 18:57:57 2015 @@ -86,8 +86,7 @@ def general_symlink(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, - wc_dir) + expected_status) ## Now we should update to the previous version, verify that no ## symlink is present, then update back to HEAD and see if the symlink @@ -133,7 +132,7 @@ def general_symlink(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) @SkipUnless(svntest.main.is_posix_os) @@ -250,7 +249,7 @@ def copy_tree_with_symlink(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Copy H to H2 H_path = os.path.join(wc_dir, 'A', 'D', 'H') H2_path = os.path.join(wc_dir, 'A', 'D', 'H2') @@ -297,7 +296,7 @@ def replace_symlink_with_file(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Now replace the symlink with a normal file and try to commit, we @@ -350,7 +349,7 @@ def remove_symlink(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Now remove it svntest.actions.run_and_verify_svn(None, [], 'rm', newfile_path) @@ -366,7 +365,7 @@ def remove_symlink(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) #---------------------------------------------------------------------- @SkipUnless(server_has_mergeinfo) @@ -395,8 +394,7 @@ def merge_symlink_into_file(sbox): 'A/Dprime/gamma' : Item(verb='Deleting'), }) - 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) # Commit a symlink in its place linktarget_path = os.path.join(wc_dir, 'linktarget') @@ -407,8 +405,7 @@ def merge_symlink_into_file(sbox): 'A/Dprime/gamma' : Item(verb='Adding'), }) - 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) # merge the creation of the symlink into the original directory svntest.main.run_svn(None, @@ -430,8 +427,7 @@ def merge_symlink_into_file(sbox): 'A/D/gamma' : Item(verb='Replacing'), }) - 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) @@ -460,8 +456,7 @@ def merge_file_into_symlink(sbox): 'A/Dprime/gamma' : Item(verb='Deleting'), }) - 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) # Commit a symlink in its place linktarget_path = os.path.join(wc_dir, 'linktarget') @@ -472,8 +467,7 @@ def merge_file_into_symlink(sbox): 'A/Dprime/gamma' : Item(verb='Adding'), }) - 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_write(gamma_path, 'changed file', 'w+') @@ -481,8 +475,7 @@ def merge_file_into_symlink(sbox): 'A/D/gamma' : Item(verb='Sending'), }) - 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) # ok, now merge the change to the file into the symlink we created, this # gives us a weird error @@ -604,10 +597,10 @@ def replace_symlink_with_dir(sbox): expected_output = svntest.wc.State(wc_dir, { }) - error_re_string = 'E145001: (Entry|Node).*has.*changed (special|kind)' + error_re_string = '.*E145001: (Entry|Node).*has.*changed (special|kind).*' svntest.actions.run_and_verify_commit(wc_dir, expected_output, - None, error_re_string, wc_dir) + None, error_re_string) # test for issue #1808: svn up deletes local symlink that obstructs # versioned file @@ -717,8 +710,7 @@ def propvalue_normalized(sbox): 'iota2' : Item(status=' ', wc_rev=2), }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, - wc_dir) + expected_status) svntest.main.run_svn(None, 'update', wc_dir) svntest.actions.run_and_verify_svn(expected_propval, [], @@ -766,7 +758,7 @@ def symlink_destination_change(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Modify the symlink to point somewhere else os.remove(newfile_path) @@ -1181,8 +1173,7 @@ def incoming_symlink_changes(sbox): 's-in-place' : Item(verb='Sending'), }) svntest.actions.run_and_verify_commit(wc_dir, - expected_output, None, None, - wc_dir) + expected_output, None) # r4 svntest.main.run_svnmucc('propdel', 'svn:special', Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Feb 27 18:57:57 2015 @@ -107,7 +107,7 @@ def status_update_with_nested_adds(sbox) # Commit. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Now we go to the backup working copy, still at revision 1. # We will run 'svn st -u', and make sure that newdir/newfile is reported @@ -1111,7 +1111,7 @@ def inconsistent_eol(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) # Make the eol style inconsistent and verify that status says nothing. svntest.main.file_write(iota_path, "line 1\nline 2\r\n", "wb") @@ -1144,8 +1144,7 @@ def status_update_with_incoming_props(sb # Commit the working copy svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Create expected trees for an update to revision 1. expected_output = svntest.wc.State(wc_dir, { @@ -1248,8 +1247,7 @@ def status_update_verbose_with_incoming_ # Commit the working copy svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Create expected trees for an update to revision 1. expected_output = svntest.wc.State(wc_dir, { @@ -1326,8 +1324,7 @@ def status_nonrecursive_update(sbox): expected_status.tweak('A/D/gamma', wc_rev=2, status=' ') svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Create expected trees for an update to revision 1. expected_output = svntest.wc.State(wc_dir, { @@ -1382,8 +1379,7 @@ def change_files_and_commit(wc_dir, file expected_status.tweak(file, wc_rev=commitrev, status=' ') svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) def status_depth_local(sbox): "run 'status --depth=X' with local changes" Modified: subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnauthz_tests.py Fri Feb 27 18:57:57 2015 @@ -128,9 +128,8 @@ def svnauthz_validate_repo_test(sbox): expected_status.add({ 'A/authz' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) # Valid authz url (file stored in repo) authz_url = repo_url + '/A/authz' @@ -174,9 +173,8 @@ def svnauthz_validate_txn_test(sbox): expected_status.add({ 'A/authz' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = ['Exit 0\n'] verify_logfile(logfilepath, expected_data) @@ -184,9 +182,8 @@ def svnauthz_validate_txn_test(sbox): svntest.main.file_append(authz_path, 'x') expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')}) expected_status.tweak('A/authz', status=' ', wc_rev=3) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = svntest.verify.RegexOutput(".*?Error parsing authz file: '.*?'", match_all=False) verify_logfile(logfilepath, expected_data, delete_log=False) @@ -201,7 +198,7 @@ def svnauthz_validate_txn_test(sbox): svntest.main.file_append(authz_path, 'x') expected_status.tweak('A/authz', status=' ', wc_rev=4) if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): + expected_status): raise svntest.Failure expected_data = svntest.verify.ExpectedOutput("Exit 2\n", match_all=False) verify_logfile(logfilepath, expected_data) @@ -279,7 +276,7 @@ def svnauthz_accessof_repo_test(sbox): 'A/authz' : Item(status=' ', wc_rev=2), }) if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): + expected_status): raise svntest.Failure # Anonymous access with no path, and no repository should be rw @@ -412,9 +409,8 @@ def svnauthz_accessof_groups_repo_test(s 'A/groups' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) # Anonymous access with no path, and no repository should be no # since it returns the highest level of access granted anywhere. @@ -628,9 +624,8 @@ def svnauthz_accessof_is_repo_test(sbox) expected_status.add({ 'A/authz' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) # Test an invalid --is option, should get an error message and exit code # of 2. @@ -753,9 +748,8 @@ def svnauthz_accessof_is_repo_test(sbox) svntest.main.file_append(authz_path, "x\n") expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')}) expected_status.tweak('A/authz', wc_rev=3) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) # Check that --is returns 1 when the syntax is invalid with a url. expected_out = svntest.verify.RegexOutput( @@ -797,9 +791,8 @@ def svnauthz_accessof_txn_test(sbox): expected_status.add({ 'A/authz' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = ['Exit 0\n'] verify_logfile(logfilepath, expected_data) @@ -812,18 +805,16 @@ def svnauthz_accessof_txn_test(sbox): expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')}) expected_status.tweak('A/authz', status=' ', wc_rev=3) svntest.main.file_append(authz_path, "groucho = r\n") - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = svntest.verify.ExpectedOutput('Exit 3\n', match_all=False) verify_logfile(logfilepath, expected_data) # break the authz file with a non-existent group and check for an exit 1. expected_status.tweak('A/authz', status=' ', wc_rev=4) svntest.main.file_append(authz_path, "@friends = rw\n") - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = svntest.verify.ExpectedOutput('Exit 1\n', match_all=False) verify_logfile(logfilepath, expected_data) @@ -831,9 +822,8 @@ def svnauthz_accessof_txn_test(sbox): expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Deleting')}) expected_status.remove('A/authz') svntest.main.run_svn(None, 'rm', authz_path) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) expected_data = svntest.verify.ExpectedOutput('Exit 2\n', match_all=False) verify_logfile(logfilepath, expected_data) @@ -887,9 +877,8 @@ def svnauthz_compat_mode_repo_test(sbox) expected_status.add({ 'A/authz' : Item(status=' ', wc_rev=2), }) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) svntest.actions.run_and_verify_svnauthz(None, None, 0, True, authz_url) @@ -897,9 +886,8 @@ def svnauthz_compat_mode_repo_test(sbox) svntest.main.file_append(authz_path, "x\n") expected_output = wc.State(wc_dir, {'A/authz' : Item(verb='Sending')}) expected_status.tweak('A/authz', status=' ', wc_rev=3) - if svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir): - raise svntest.Failure + svntest.actions.run_and_verify_commit(wc_dir, expected_output, + expected_status) svntest.actions.run_and_verify_svnauthz(None, None, 1, True, authz_path) Modified: subversion/trunk/subversion/tests/cmdline/svnlook_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnlook_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnlook_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnlook_tests.py Fri Feb 27 18:57:57 2015 @@ -95,9 +95,7 @@ def test_misc(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # give the repo a new UUID uuid = "01234567-89ab-cdef-89ab-cdef01234567" @@ -234,9 +232,7 @@ def delete_file_in_moved_dir(sbox): ### in order to get this commit working again. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) exit_code, output, errput = svntest.main.run_svnlook("dirs-changed", repo_dir) @@ -383,9 +379,7 @@ def changed_copy_info(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) exit_code, output, errput = svntest.main.run_svnlook("changed", repo_dir) if errput: @@ -481,9 +475,7 @@ def diff_ignore_whitespace(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # Check the output of 'svnlook diff -x --ignore-space-change' on mu. # It should not print anything. @@ -536,9 +528,7 @@ def diff_ignore_eolstyle(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # Grab the diff exit_code, expected_output, err = svntest.actions.run_and_verify_svn( Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Fri Feb 27 18:57:57 2015 @@ -1456,7 +1456,7 @@ def process_output_for_commit(output, er def run_and_verify_commit(wc_dir_name, output_tree, status_tree, - error_re_string = None, + expected_stderr=[], *args): """Commit and verify results within working copy WC_DIR_NAME, sending ARGS to the commit subcommand. @@ -1466,9 +1466,7 @@ def run_and_verify_commit(wc_dir_name, o be compared. (This is a good way to check that revision numbers were bumped.) - If ERROR_RE_STRING is None, the commit must not exit with error. If - ERROR_RE_STRING is a string, the commit must exit with error, and - the error message must match regular expression ERROR_RE_STRING. + EXPECTED_STDERR is handled as run_and_verify_svn() Return if successful, raise on failure.""" @@ -1476,21 +1474,15 @@ def run_and_verify_commit(wc_dir_name, o output_tree = output_tree.old_tree() # Commit. + if len(args) == 0: + args = (wc_dir_name,) if '-m' not in args and '-F' not in args: args = list(args) + ['-m', 'log msg'] - exit_code, output, errput = main.run_svn(error_re_string, 'ci', - *args) - - if error_re_string: - if not error_re_string.startswith(".*"): - error_re_string = ".*(" + error_re_string + ")" - expected_err = verify.RegexOutput(error_re_string, match_all=False) - verify.verify_outputs(None, None, errput, None, expected_err) - - # Else not expecting error: + exit_code, output, errput = run_and_verify_svn(None, expected_stderr, + 'ci', *args) # Convert the output into a tree. - output = process_output_for_commit(output, error_re_string) + output = process_output_for_commit(output, expected_stderr) actual = tree.build_tree_from_commit(output) # Verify actual output against expected output. @@ -2150,7 +2142,7 @@ def inject_conflict_into_wc(sbox, state_ if expected_status: expected_status.tweak(state_path, wc_rev=merged_rev) run_and_verify_commit(wc_dir, expected_output, expected_status, - None, file_path) + [], file_path) # Backdate the file. exit_code, output, errput = main.run_svn(None, "up", "-r", str(prev_rev), @@ -2252,7 +2244,7 @@ def build_greek_tree_conflicts(sbox): expected_status = get_virginal_state(wc_dir, 1) expected_status.tweak('A/D/G/pi', wc_rev='2') expected_status.remove('A/D/G/rho', 'A/D/G/tau') - run_and_verify_commit(wc_dir, expected_output, expected_status, None, + run_and_verify_commit(wc_dir, expected_output, expected_status, [], '-m', 'Incoming changes.', wc_dir ) # Update back to the pristine state ("time-warp"). Modified: subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py Fri Feb 27 18:57:57 2015 @@ -525,8 +525,7 @@ def deep_trees_run_tests_scheme_for_upda x_status.wc_dir = base run_and_verify_commit(base, None, x_status, - test_case.commit_block_string, - base) + test_case.commit_block_string) except: logger.warn("ERROR IN: Tests scheme for update: " + "while checking commit-blocking in '%s'", test_case.name) @@ -771,8 +770,7 @@ def deep_trees_run_tests_scheme_for_swit x_status.wc_dir = local run_and_verify_commit(local, None, x_status, - test_case.commit_block_string, - local) + test_case.commit_block_string) except: logger.warn("ERROR IN: Tests scheme for switch: " + "while checking commit-blocking in '%s'", test_case.name) @@ -984,8 +982,7 @@ def deep_trees_run_tests_scheme_for_merg x_status.wc_dir = local run_and_verify_commit(local, None, x_status, - test_case.commit_block_string, - local) + test_case.commit_block_string) except: logger.warn("ERROR IN: Tests scheme for merge: " + "while checking commit-blocking in '%s'", test_case.name) @@ -1147,8 +1144,7 @@ def commit_routine_switching(wc_dir, ver # same URL. We don't allow this. svntest.actions.run_and_verify_commit( wc_dir, None, None, - "svn: E195003: Cannot commit both .* as they refer to the same URL$", - wc_dir) + "svn: E195003: Cannot commit both .* as they refer to the same URL$") # Okay, that all taken care of, let's revert the A/D/G/pi path and # move along. Afterward, we should be okay to commit. (Sorry, @@ -1176,8 +1172,7 @@ def commit_routine_switching(wc_dir, ver if verify: svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) else: svntest.main.run_svn(None, 'ci', '-m', 'log msg', wc_dir) Modified: subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py Fri Feb 27 18:57:57 2015 @@ -164,10 +164,7 @@ def set_up_dir_replace(sbox): 'A/B/F/foo/new file' : Item(status=' ', wc_rev=2), 'A/B/F/foo/new file 2' : Item(status=' ', wc_rev=2), }) - actions.run_and_verify_commit(wc_dir, - expected_output, - expected_status, - None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) # Merge foo onto C expected_output = wc.State(C_path, { @@ -217,10 +214,7 @@ def set_up_dir_replace(sbox): 'A/C/foo/new file 2' : Item(status=' ', wc_rev=3), }) - actions.run_and_verify_commit(wc_dir, - expected_output, - expected_status, - None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) # Delete foo on F, creating r4. actions.run_and_verify_svn(None, [], 'rm', foo_path) @@ -234,10 +228,7 @@ def set_up_dir_replace(sbox): 'A/C/foo/new file' : Item(status=' ', wc_rev=3), 'A/C/foo/new file 2' : Item(status=' ', wc_rev=3), }) - actions.run_and_verify_commit(wc_dir, - expected_output, - expected_status, - None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) #---------------------------------------------------------------------- def set_up_branch(sbox, branch_only = False, nbr_of_branches = 1): @@ -333,11 +324,7 @@ def set_up_branch(sbox, branch_only = Fa dest_name)) expected_output = wc.State(wc_dir, {dest_name : Item(verb='Adding')}) - actions.run_and_verify_commit(wc_dir, - expected_output, - expected_status, - None, - wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) for i in range(nbr_of_branches): if i == 0: copy_A('A_COPY', i + 2) @@ -354,8 +341,7 @@ def set_up_branch(sbox, branch_only = Fa "New content") expected_output = wc.State(wc_dir, {'A/D/H/psi' : Item(verb='Sending')}) expected_status.tweak('A/D/H/psi', wc_rev=nbr_of_branches + 2) - actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) expected_disk.tweak('A/D/H/psi', contents="New content") # r(nbr_of_branches + 3) - modify and commit A/D/G/rho @@ -363,8 +349,7 @@ def set_up_branch(sbox, branch_only = Fa "New content") expected_output = wc.State(wc_dir, {'A/D/G/rho' : Item(verb='Sending')}) expected_status.tweak('A/D/G/rho', wc_rev=nbr_of_branches + 3) - actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) expected_disk.tweak('A/D/G/rho', contents="New content") # r(nbr_of_branches + 4) - modify and commit A/B/E/beta @@ -372,8 +357,7 @@ def set_up_branch(sbox, branch_only = Fa "New content") expected_output = wc.State(wc_dir, {'A/B/E/beta' : Item(verb='Sending')}) expected_status.tweak('A/B/E/beta', wc_rev=nbr_of_branches + 4) - actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) expected_disk.tweak('A/B/E/beta', contents="New content") # r(nbr_of_branches + 5) - modify and commit A/D/H/omega @@ -381,8 +365,7 @@ def set_up_branch(sbox, branch_only = Fa "New content") expected_output = wc.State(wc_dir, {'A/D/H/omega' : Item(verb='Sending')}) expected_status.tweak('A/D/H/omega', wc_rev=nbr_of_branches + 5) - actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) expected_disk.tweak('A/D/H/omega', contents="New content") return expected_disk, expected_status Modified: subversion/trunk/subversion/tests/cmdline/svnversion_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnversion_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnversion_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnversion_tests.py Fri Feb 27 18:57:57 2015 @@ -72,8 +72,7 @@ def svnversion_test(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/mu', wc_rev=2) if svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir): + expected_output, expected_status): raise svntest.Failure # Unmodified, mixed @@ -189,8 +188,7 @@ ext-file -r 1 %s/A/D/H/omega expected_status.tweak('A/C', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Update to get it on disk svntest.actions.run_and_verify_svn(None, [], 'up', wc_dir) Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Feb 27 18:57:57 2015 @@ -664,8 +664,7 @@ def obstructed_switch(sbox): expected_status = actions.get_virginal_state(wc_dir, 1) expected_status.remove('A/B/E/alpha') - actions.run_and_verify_commit(wc_dir, expected_output, expected_status, - None, wc_dir) + actions.run_and_verify_commit(wc_dir, expected_output, expected_status) # echo "hello" >> A/B/E/alpha main.file_append(A_B_E_alpha, 'hello') @@ -763,7 +762,7 @@ def commit_mods_below_switch(sbox): # with "'A/C/E' is missing or not locked" svntest.actions.run_and_verify_commit(wc_dir, expected_output, expected_status, - None, C_path, D_path) + [], C_path, D_path) #---------------------------------------------------------------------- # Issue 2306. @@ -801,7 +800,7 @@ def refresh_read_only_attribute(sbox): expected_status.tweak('A/mu', wc_rev=3) svntest.actions.run_and_verify_commit(wc_dir, expected_output, expected_status, - None, mu_path) + [], mu_path) # The file on which svn:needs-lock was set is now expected to be read-only. if os.access(mu_path, os.W_OK): @@ -1391,9 +1390,7 @@ def mergeinfo_switch_elision(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # Make some changes under A/B @@ -1403,7 +1400,7 @@ def mergeinfo_switch_elision(sbox): {'A/B/E/beta' : Item(verb='Sending')}) expected_status.tweak('A/B/E/beta', wc_rev=3) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # r4 - modify and commit A/B/E/alpha svntest.main.file_write(alpha_path, "New content") @@ -1411,7 +1408,7 @@ def mergeinfo_switch_elision(sbox): {'A/B/E/alpha' : Item(verb='Sending')}) expected_status.tweak('A/B/E/alpha', wc_rev=4) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Merge r2:4 into A/B_COPY_1 expected_output = svntest.wc.State(B_COPY_1_path, { @@ -1463,7 +1460,7 @@ def mergeinfo_switch_elision(sbox): expected_status.tweak('A/B_COPY_1/E/beta', wc_rev=5) expected_status.tweak('A/B_COPY_1/lambda', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Merge r2:4 into A/B_COPY_2/E expected_output = svntest.wc.State(E_COPY_2_path, { Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Fri Feb 27 18:57:57 2015 @@ -298,7 +298,7 @@ def keywords_from_birth(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - None, None, wc_dir) + None) # Make sure the unexpanded URL keyword got expanded correctly. fp = open(url_unexp_path, 'r') @@ -476,7 +476,7 @@ def update_modified_with_translation(sbo svntest.actions.run_and_verify_commit(wc_dir, expected_output, expected_status, - None, rho_path) + [], rho_path) # Change rho again svntest.main.file_write(rho_path, "1\n2\n3\n4\n4.5\n5\n6\n7\n8\n9\n") @@ -488,7 +488,7 @@ def update_modified_with_translation(sbo svntest.actions.run_and_verify_commit(wc_dir, expected_output, expected_status, - None, rho_path) + [], rho_path) # Locally modify rho again. svntest.main.file_write(rho_path, "1\n2\n3\n4\n4.5\n5\n6\n7\n8\n9\n10\n") @@ -666,8 +666,7 @@ def cat_keyword_expansion(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/mu', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir) + expected_output, expected_status) # Change the author to value which will get truncated on expansion full_author = "x" * 400 @@ -691,8 +690,7 @@ def cat_keyword_expansion(sbox): }) expected_status.tweak('A/B/lambda', wc_rev=3) svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir) + expected_output, expected_status) # At one stage the keywords were expanded to values for the requested # revision, not to those committed revision @@ -728,8 +726,7 @@ def copy_propset_commit(sbox): }) expected_status.tweak('A/mu2', status=' ', wc_rev=2, copied=None) svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir) + expected_output, expected_status) #---------------------------------------------------------------------- # Create a greek tree, commit a keyword into one file, @@ -751,8 +748,7 @@ def propset_commit_checkout_nocrash(sbox expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/mu', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir) + expected_output, expected_status) # Set property to do keyword expansion on A/mu, commit. svntest.actions.run_and_verify_svn(None, [], @@ -763,8 +759,7 @@ def propset_commit_checkout_nocrash(sbox expected_status = svntest.actions.get_virginal_state(wc_dir, 1) expected_status.tweak('A/mu', wc_rev=3) svntest.actions.run_and_verify_commit(wc_dir, - expected_output, expected_status, - None, wc_dir) + expected_output, expected_status) # Check out into another wc dir other_wc_dir = sbox.add_wc_path('other') @@ -832,9 +827,7 @@ def props_only_file_update(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # Create r3 that drops svn:keywords @@ -847,9 +840,7 @@ def props_only_file_update(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # Now, go back to r2. iota should have the Author keyword expanded. expected_disk = svntest.main.greek_state.copy() Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Fri Feb 27 18:57:57 2015 @@ -444,7 +444,7 @@ def ensure_tree_conflict(sbox, operation # For switch/merge, there is no such precondition. if operation == 'update': logger.debug("--- Trying to commit (expecting 'out-of-date' error)") - run_and_verify_commit(".", None, None, "Commit failed", + run_and_verify_commit(".", None, None, ".*Commit failed.*", target_path) if modaction.startswith('f'): @@ -824,8 +824,7 @@ def force_del_tc_inside(sbox): expected_status.remove('A/C') run_and_verify_commit(wc_dir, - expected_output, expected_status, None, - wc_dir) + expected_output, expected_status) #---------------------------------------------------------------------- @@ -904,8 +903,7 @@ def force_del_tc_is_target(sbox): expected_output = wc.State(wc_dir, {}) run_and_verify_commit(wc_dir, - expected_output, expected_status, None, - wc_dir) + expected_output, expected_status) #---------------------------------------------------------------------- @@ -1504,8 +1502,7 @@ def update_delete_mixed_rev(sbox): 'A/B/E/beta', 'A/B/lambda', status=' ', wc_rev=4, copied=None, treeconflict=None) run_and_verify_commit(wc_dir, - expected_output, expected_status, None, - wc_dir) + expected_output, expected_status) expected_info = { 'Name': 'alpha2', Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1662794&r1=1662793&r2=1662794&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/update_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/update_tests.py Fri Feb 27 18:57:57 2015 @@ -127,7 +127,7 @@ def update_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) # Make a backup copy of the working copy. wc_backup = sbox.add_wc_path('backup') @@ -151,7 +151,7 @@ def update_binary_file(sbox): # Commit original working copy again, creating revision 3. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Now start working in the backup working copy: @@ -249,7 +249,7 @@ def update_binary_file_2(sbox): # Commit the new binary filea, creating revision 2. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Make some mods to the binary files. svntest.main.file_append(theta_path, "foobar") @@ -272,7 +272,7 @@ def update_binary_file_2(sbox): # Commit original working copy again, creating revision 3. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Create expected output tree for an update to rev 2. expected_output = svntest.wc.State(wc_dir, { @@ -340,7 +340,7 @@ def update_binary_file_3(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) # Make some mods to the binary files. svntest.main.file_append(theta_path, "foobar") @@ -359,7 +359,7 @@ def update_binary_file_3(sbox): # Commit modified working copy, creating revision 3. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Now we locally modify the file back to the old version. svntest.main.file_write(theta_path, theta_contents, 'wb') @@ -581,7 +581,7 @@ def receive_overlapping_same_change(sbox # Commit the change, creating revision 2. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Expected output tree for update of other_wc. expected_output = svntest.wc.State(other_wc, { @@ -644,7 +644,7 @@ def update_to_resolve_text_conflicts(sbo # 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 = svntest.wc.State(wc_backup, { @@ -822,7 +822,7 @@ def update_after_add_rm_deleted(sbox): expected_status.remove('A/B/F') svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # alpha and F are now in state "deleted", next we add a new ones svntest.main.file_append(alpha_path, "new alpha") @@ -962,7 +962,7 @@ def update_replace_dir(sbox): expected_status.remove('A/B/F') svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Add replacement directory svntest.actions.run_and_verify_svn(None, [], 'mkdir', F_path) @@ -976,7 +976,7 @@ def update_replace_dir(sbox): expected_status.tweak('A/B/F', wc_rev=3) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Update to HEAD expected_output = svntest.wc.State(wc_dir, { @@ -1030,7 +1030,7 @@ def update_single_file(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) # At one stage 'svn up file' failed with a parent lock error was_cwd = os.getcwd() @@ -1073,7 +1073,7 @@ def prop_update_on_scheduled_delete(sbox # Commit the change, creating revision 2. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) svntest.main.run_svn(None, 'rm', other_iota_path) @@ -1233,8 +1233,7 @@ def another_hudson_problem(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Delete directory G from the repository svntest.actions.run_and_verify_svn(['Committing transaction...\n', @@ -1300,8 +1299,7 @@ def update_deleted_targets(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Explicit update must not remove the 'deleted=true' entries svntest.actions.run_and_verify_svn(exp_noop_up_out(2), [], @@ -1388,8 +1386,7 @@ def non_recursive_update(sbox): expected_status.tweak('A/mu', 'A/D/G/rho', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, wc_dir) + expected_status) # Update back to revision 1 expected_output = svntest.wc.State(wc_dir, { @@ -1689,7 +1686,7 @@ def update_xml_unsafe_dir(sbox): # Commit. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # chdir into the funky path, and update from there. os.chdir(test_path) @@ -1767,7 +1764,7 @@ def conflict_markers_matching_eol(sbox): # Commit the original change and note the 'base' revision number svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) cur_rev = cur_rev + 1 base_rev = cur_rev @@ -2051,7 +2048,7 @@ def forced_update(sbox): # Commit. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Make a local mod to mu that will merge cleanly. backup_mu_path = os.path.join(wc_backup, 'A', 'mu') @@ -2166,7 +2163,7 @@ def forced_update_failures(sbox): # Commit. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Create an unversioned dir A/B/F/nu that will obstruct the file of the # same name coming from the repository. Create an unversioned file A/C/I @@ -2372,7 +2369,7 @@ def update_wc_on_windows_drive(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, + expected_status, [], wc_dir, zeta_path) # Non recursive commit @@ -2394,7 +2391,7 @@ def update_wc_on_windows_drive(sbox): }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, + expected_status, [], '-N', wc_dir, dir1_path, file1_path) @@ -2675,7 +2672,7 @@ def update_with_obstructing_additions(sb # 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. @@ -2979,7 +2976,7 @@ def update_conflicted(sbox): expected_status.tweak('iota', 'A/mu', 'A/B/lambda', 'A/D', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Do another change to each path that we will need later. # Also, change a file below A/D in the path. @@ -2998,7 +2995,7 @@ def update_conflicted(sbox): 'A/D/G/pi': Item(verb='Sending')}) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Go back to revision 1. expected_output = svntest.wc.State(wc_dir, { @@ -3154,9 +3151,7 @@ def mergeinfo_update_elision(sbox): svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, - None, - wc_dir) + expected_status) # Make some changes under A/B @@ -3168,7 +3163,7 @@ def mergeinfo_update_elision(sbox): expected_status.tweak('A/B/E/beta', wc_rev=3) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # r4 - modify and commit A/B/lambda svntest.main.file_write(lambda_path, "New content") @@ -3178,7 +3173,7 @@ def mergeinfo_update_elision(sbox): expected_status.tweak('A/B/lambda', wc_rev=4) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # r5 - modify and commit A/B/E/alpha svntest.main.file_write(alpha_path, "New content") @@ -3188,7 +3183,7 @@ def mergeinfo_update_elision(sbox): expected_status.tweak('A/B/E/alpha', wc_rev=5) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Merge r2:5 into A/B_COPY expected_output = wc.State(B_COPY_path, { @@ -3248,7 +3243,7 @@ def mergeinfo_update_elision(sbox): expected_status.tweak('A/B_COPY/lambda', wc_rev=6) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Update WC back to r5, A/COPY_B is at it's pre-merge state again expected_output = wc.State(wc_dir, @@ -3342,7 +3337,7 @@ def mergeinfo_update_elision(sbox): expected_status.tweak('A/B/E/alpha', 'A/B_COPY/E/alpha', status=' ', wc_rev=7) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Update A to get all paths to the same working revision. svntest.actions.run_and_verify_svn(exp_noop_up_out(7), [], @@ -3399,7 +3394,7 @@ def mergeinfo_update_elision(sbox): expected_status.tweak('A/B_COPY/E', 'A/B_COPY/E/alpha', wc_rev=8) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Update A/COPY_B/E back to r7 expected_output = wc.State(wc_dir, { @@ -3548,7 +3543,7 @@ def update_copied_from_replaced_and_chan }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Modify fn2. fn2_final_contents = "I have new contents for the middle file." @@ -3567,7 +3562,7 @@ def update_copied_from_replaced_and_chan }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Go back to r1. expected_output = svntest.wc.State(wc_dir, { @@ -3635,7 +3630,7 @@ def update_copied_and_deleted_prop(sbox) expected_status_mixed.tweak('iota', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status_mixed, None, wc_dir) + expected_status_mixed) # Copy iota to iota2 and delete the property on it. svntest.actions.run_and_verify_svn(None, [], @@ -3653,7 +3648,7 @@ def update_copied_and_deleted_prop(sbox) }) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status_mixed, None, wc_dir) + expected_status_mixed) # Update the whole wc, verifying disk as well. expected_output = svntest.wc.State(wc_dir, { }) @@ -3803,7 +3798,7 @@ def update_accept_conflicts(sbox): # Commit. svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Now we'll update each of our 5 files in wc_backup; each one will get # conflicts, and we'll handle each with a different --accept option. @@ -3996,7 +3991,7 @@ def restarted_update_should_delete_dir_p expected_status.tweak('A', wc_rev=2) svntest.actions.run_and_verify_commit(wc_dir, expected_output, - expected_status, None, wc_dir) + expected_status) # Create a second working copy. ### Does this hack still work with wc-ng? @@ -4023,7 +4018,7 @@ def restarted_update_should_delete_dir_p }) svntest.actions.run_and_verify_commit(other_wc, expected_output, - expected_status, None, other_wc) + expected_status) # Back in the first working copy, create an obstructing path and # update. The update will flag a tree conflict. @@ -4752,7 +4747,7 @@ def tree_conflict_uc1_update_deleted_tre }) run_and_verify_commit(wc_dir, expected_output, expected_status, - None, wc_dir, '-m', 'commit resolved tree') + [], wc_dir, '-m', 'commit resolved tree') # Issue #3334: a delete-onto-modified tree conflict should leave the node
