Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D2D110B7A for ; Fri, 27 Feb 2015 22:37:15 +0000 (UTC) Received: (qmail 42772 invoked by uid 500); 27 Feb 2015 22:37:15 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 42666 invoked by uid 500); 27 Feb 2015 22:37:15 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 42525 invoked by uid 99); 27 Feb 2015 22:37:15 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Feb 2015 22:37:15 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id DA029AC0714 for ; Fri, 27 Feb 2015 22:37:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1662838 [4/5] - in /subversion/trunk/subversion/tests/cmdline: ./ svntest/ Date: Fri, 27 Feb 2015 22:37:13 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150227223714.DA029AC0714@hades.apache.org> Modified: subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Fri Feb 27 22:37:13 2015 @@ -153,8 +153,7 @@ def delete_file_and_dir(sbox): expected_disk, expected_status2, expected_skip, - None, None, None, None, None, - True) + check_props=True) #---------------------------------------------------------------------- # This is a regression for issue #1176. @@ -252,7 +251,7 @@ def merge_catches_nonexistent_target(sbo expected_disk, expected_status, expected_skip, - None, None, None, None, None, True) + check_props=True) expected_status.add({ 'newfile' : Item(status='! ', treeconflict='C'), @@ -327,8 +326,7 @@ def merge_tree_deleted_in_target(sbox): expected_disk, expected_status, expected_skip, - None, None, None, None, None, - 1, 0) + check_props=True) expected_status.add({ 'E' : Item(status='! ', treeconflict='C'), }) @@ -416,8 +414,8 @@ def three_way_merge_add_of_existing_bina expected_disk, expected_status, expected_skip, - None, None, None, None, None, - 1, 0, '--allow-mixed-revisions', A_path) + [], True, False, + '--allow-mixed-revisions', A_path) #---------------------------------------------------------------------- # Issue #2515 @@ -475,9 +473,7 @@ def merge_added_dir_to_deleted_in_target expected_elision_output, expected_disk, None, - expected_skip, - None, None, None, None, None, - 0, 0) + expected_skip) #---------------------------------------------------------------------- # Issue 2584 @@ -636,8 +632,7 @@ def mergeinfo_recording_in_skipped_merge expected_disk, expected_status, expected_skip, - None, None, None, None, None, - 1, 1) + [], True, True) #---------------------------------------------------------------------- def del_differing_file(sbox): @@ -1526,7 +1521,7 @@ def merge_replace_setup(sbox): }) actions.run_and_verify_update(wc_dir, expected_output, expected_disk, - expected_status, None, None, None, None, None, False, wc_dir) + expected_status) # ACTIONS ON THE MERGE SOURCE (branch) # various deletes of files and dirs @@ -1570,7 +1565,7 @@ def merge_replace_setup(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) # replacements. # file-with-file Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/move_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/move_tests.py Fri Feb 27 22:37:13 2015 @@ -152,7 +152,7 @@ def move_file_test(sbox, source, dest, m # update to start_rev svntest.actions.run_and_verify_update(wc_dir, test['start_output'], test['start_disk'], test['start_status'], - None, None, None, None, None, False, + [], False, '-r', test['start_rev'], wc_dir) # execute the move move_func(test['start_rev']) @@ -162,7 +162,7 @@ def move_file_test(sbox, source, dest, m # properties. svntest.actions.run_and_verify_update(wc_dir, test['up_output'], test['up_disk'], test['up_status'], - None, None, None, None, None, True, + [], True, '-r', test['end_rev'], wc_dir) revert_paths = None @@ -1403,8 +1403,7 @@ def move_many_update_add(sbox): svntest.actions.run_and_verify_update(wc_dir, expected_output, None, expected_status, - None, None, None, - None, None, None, + [], False, wc_dir, '--accept', 'mine-conflict') # And another one @@ -1434,8 +1433,7 @@ def move_many_update_add(sbox): # This currently triggers an assertion failure svntest.actions.run_and_verify_update(wc_dir, expected_output, None, expected_status, - None, None, None, - None, None, None, + [], False, wc_dir, '--accept', 'mine-conflict') @Issue(4437) Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Fri Feb 27 22:37:13 2015 @@ -197,7 +197,7 @@ def update_props(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, + [], 1, '-r', '2', wc_backup) # This adds properties to nodes that have properties @@ -210,7 +210,7 @@ def update_props(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, + [], 1, '-r', '3', wc_backup) @@ -275,7 +275,7 @@ def downdate_props(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, + [], 1, '-r', '1', wc_dir) #---------------------------------------------------------------------- @@ -355,14 +355,8 @@ def update_conflict_props(sbox): expected_output, expected_disk, expected_status, - None, - svntest.tree.detect_conflict_files, - extra_files, - None, None, 1) - - if len(extra_files) != 0: - logger.warn("didn't get expected conflict files") - raise svntest.verify.SVNUnexpectedOutput + check_props=True, + extra_files=extra_files) # Resolve the conflicts svntest.actions.run_and_verify_resolved([mu_path, A_path]) @@ -520,8 +514,7 @@ def revert_replacement_props(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, - 1) + check_props=True) #---------------------------------------------------------------------- @Issues(920,2065) @@ -1010,8 +1003,7 @@ def binary_props(sbox): svntest.actions.run_and_verify_update(wc_backup, expected_output, expected_disk, - expected_status, - None, None, None, None, None, 0) + expected_status) # Now, check those properties. svntest.actions.check_prop('prop_zb', B_path_bak, [prop_zb]) @@ -1277,7 +1269,7 @@ def update_props_on_wc_root(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, 1) + check_props=True) # test for issue 2743 @Issue(2743) @@ -1530,7 +1522,7 @@ def remove_custom_ns_props(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, 1) + check_props=True) def props_over_time(sbox): "property retrieval with peg and operative revs" @@ -2339,13 +2331,9 @@ def file_matching_dir_prop_reject(sbox): expected_output, expected_disk, expected_status, - None, - svntest.tree.detect_conflict_files, - extra_files, - None, None, True, '-r', '2', wc_dir) - if len(extra_files) != 0: - logger.warn("didn't get expected conflict files") - raise svntest.verify.SVNUnexpectedOutput + [], True, + '-r', '2', wc_dir, + extra_files=extra_files) # Revert and update to check that conflict files are removed svntest.actions.run_and_verify_svn(None, [], 'revert', '-R', wc_dir) @@ -2362,7 +2350,7 @@ def file_matching_dir_prop_reject(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, True) + check_props=True) def pristine_props_listed(sbox): "check if pristine properties are visible" @@ -2727,8 +2715,7 @@ def dir_prop_conflict_details(sbox): expected_output, None, expected_status, - None, None, None, None, None, 1, - wc_dir) + check_props=True) # The conflict properties file line was shown for previous versions, but the # conflict source urls are new since 1.8. Modified: subversion/trunk/subversion/tests/cmdline/resolve_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/resolve_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/resolve_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/resolve_tests.py Fri Feb 27 22:37:13 2015 @@ -317,7 +317,7 @@ def resolved_on_wc_root(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, False, + [], False, '-r1', wc) # Deletions so that the item becomes unversioned and @@ -349,7 +349,7 @@ def resolved_on_wc_root(sbox): expected_output, expected_disk, None, - None, None, None, None, None, False, + [], False, wc) svntest.actions.run_and_verify_unquiet_status(wc, expected_status) @@ -448,7 +448,7 @@ def resolved_on_deleted_item(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, False, + [], False, wc) # Create some 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=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/revert_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/revert_tests.py Fri Feb 27 22:37:13 2015 @@ -1598,13 +1598,13 @@ def revert_obstructing_wc(sbox): # Checkout wc as depth empty svntest.actions.run_and_verify_checkout(sbox.repo_url, wc_dir, expected_output, expected_disk, - None, None, None, None, + [], '--depth', 'empty') # And create an obstructing working copy as A svntest.actions.run_and_verify_checkout(sbox.repo_url, wc_dir + '/A', expected_output, expected_disk, - None, None, None, None, + [], '--depth', 'empty') # Now try to fetch the entire wc, which will find an obstruction @@ -1621,8 +1621,7 @@ def revert_obstructing_wc(sbox): svntest.actions.run_and_verify_update(wc_dir, expected_output, None, expected_status, - None, None, None, - None, None, None, + [], False, wc_dir, '--set-depth', 'infinity') # Revert should do nothing (no local changes), and report the obstruction Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/special_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/special_tests.py Fri Feb 27 22:37:13 2015 @@ -930,8 +930,7 @@ def update_symlink(sbox): expected_output, expected_disk, expected_status, - None, None, None, - None, None, 1) + check_props=True) #---------------------------------------------------------------------- @Issue(4091) @@ -1204,7 +1203,6 @@ def incoming_symlink_changes(sbox): expected_output, None, expected_status, - None, None, None, None, None, check_props=True) # Update back to r2, to prepare some local changes @@ -1221,8 +1219,7 @@ def incoming_symlink_changes(sbox): expected_output, None, expected_status, - None, None, None, None, None, - True, + [], True, wc_dir, '-r', '2') # Ok, now add a property on all of them to make future symlinkness changes @@ -1246,8 +1243,7 @@ def incoming_symlink_changes(sbox): expected_output, None, expected_status, - None, None, None, None, None, - True) + check_props=True) #---------------------------------------------------------------------- @Issue(4479) Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Fri Feb 27 22:37:13 2015 @@ -735,7 +735,7 @@ use-commit-times = yes expected_status = svntest.actions.get_virginal_state(other_wc, 1) svntest.actions.run_and_verify_update(other_wc, expected_output, expected_disk, expected_status, - None, None, None, None, None, False, + [], False, other_wc, '--config-dir', config_dir) iota_text_timestamp = get_text_timestamp(other_iota_path) if (iota_text_timestamp[17] != ':' or @@ -1159,7 +1159,7 @@ def status_update_with_incoming_props(sb expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, + [], True, '-r', '1', wc_dir) # Can't use run_and_verify_status here because the out-of-date @@ -1263,7 +1263,7 @@ def status_update_verbose_with_incoming_ expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, + [], True, '-r', '1', wc_dir) # Can't use run_and_verify_status here because the out-of-date @@ -1339,7 +1339,7 @@ def status_nonrecursive_update(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, 0, + [], False, '-r', '1', wc_dir) # Check the remote status of folder A (non-recursively) Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Fri Feb 27 22:37:13 2015 @@ -482,11 +482,8 @@ def run_and_verify_svnauthz(expected_std def run_and_verify_checkout2(do_remove, URL, wc_dir_name, output_tree, disk_tree, - singleton_handler_a = None, - a_baton = None, - singleton_handler_b = None, - b_baton = None, - *args): + expected_stderr=[], + *args, **kw): """Checkout the URL into a new directory WC_DIR_NAME. *ARGS are any extra optional args to the checkout subcommand. @@ -512,8 +509,9 @@ def run_and_verify_checkout2(do_remove, # Checkout and make a tree of the output, using l:foo/p:bar ### todo: svn should not be prompting for auth info when using ### repositories with no auth/auth requirements - exit_code, output, errput = main.run_svn(None, 'co', - URL, wc_dir_name, *args) + exit_code, output, errput = run_and_verify_svn(None, expected_stderr, + 'co', URL, wc_dir_name, + *args) actual = tree.build_tree_from_checkout(output) # Verify actual output against expected output. @@ -524,16 +522,11 @@ def run_and_verify_checkout2(do_remove, raise if disk_tree: - verify_disk(wc_dir_name, disk_tree, False, - singleton_handler_a, a_baton, - singleton_handler_b, b_baton) + verify_disk(wc_dir_name, disk_tree, False, **kw) def run_and_verify_checkout(URL, wc_dir_name, output_tree, disk_tree, - singleton_handler_a = None, - a_baton = None, - singleton_handler_b = None, - b_baton = None, - *args): + expected_stderr=[], + *args, **kw): """Same as run_and_verify_checkout2(), but without the DO_REMOVE arg. WC_DIR_NAME is deleted if present unless the '--force' option is passed in *ARGS.""" @@ -544,11 +537,7 @@ def run_and_verify_checkout(URL, wc_dir_ # of obstructing paths. return run_and_verify_checkout2(('--force' not in args), URL, wc_dir_name, output_tree, disk_tree, - singleton_handler_a, - a_baton, - singleton_handler_b, - b_baton, - *args) + expected_stderr, *args, **kw) def run_and_verify_export(URL, export_dir_name, output_tree, disk_tree, @@ -780,11 +769,8 @@ def verify_update(actual_output, elision_output_tree, disk_tree, status_tree, - singleton_handler_a=None, - a_baton=None, - singleton_handler_b=None, - b_baton=None, - check_props=False): + check_props=False, + extra_files=None): """Verify update of WC_DIR_NAME. The subcommand output (found in ACTUAL_OUTPUT, ACTUAL_MERGEINFO_OUTPUT, @@ -847,8 +833,7 @@ def verify_update(actual_output, # Create a tree by scanning the working copy, and verify it if disk_tree: verify_disk(wc_dir_name, disk_tree, check_props, - singleton_handler_a, a_baton, - singleton_handler_b, b_baton) + extra_files=extra_files) # Verify via 'status' command too, if possible. if status_tree: @@ -856,12 +841,22 @@ def verify_update(actual_output, def verify_disk(wc_dir_name, disk_tree, check_props=False, - singleton_handler_a = None, a_baton = None, - singleton_handler_b = None, b_baton = None): + extra_files=None): """Verify WC_DIR_NAME against DISK_TREE. If CHECK_PROPS is set, the comparison will examin props. Returns if successful, raises on failure.""" + singleton_handler_a = None + a_baton = None, + singleton_handler_b = None + b_baton = None + done_a = None + + if extra_files: + singleton_handler_a = svntest.tree.detect_conflict_files + done_a = svntest.tree.detect_conflict_files_done + a_baton = extra_files + if isinstance(disk_tree, wc.State): disk_tree = disk_tree.old_tree() @@ -875,18 +870,15 @@ def verify_disk(wc_dir_name, disk_tree, _log_tree_state("ACTUAL DISK TREE:", actual_disk) raise - + if done_a: + done_a(a_baton) def run_and_verify_update(wc_dir_name, output_tree, disk_tree, status_tree, - error_re_string = None, - singleton_handler_a = None, - a_baton = None, - singleton_handler_b = None, - b_baton = None, + expected_stderr=[], check_props = False, - *args): + *args, **kw): """Update WC_DIR_NAME. *ARGS are any extra optional args to the update subcommand. NOTE: If *ARGS is specified at all, explicit @@ -904,38 +896,20 @@ def run_and_verify_update(wc_dir_name, None, the 'svn status' output will be verified against STATUS_TREE. (This is a good way to check that revision numbers were bumped.) - For the DISK_TREE verification, SINGLETON_HANDLER_A and - SINGLETON_HANDLER_B will be passed to tree.compare_trees -- see that - function's doc string for more details. - If CHECK_PROPS is set, then disk comparison will examine props. Return if successful, raise on failure.""" # Update and make a tree of the output. - if len(args): - exit_code, output, errput = main.run_svn(error_re_string, 'up', *args) - else: - exit_code, output, errput = main.run_svn(error_re_string, - 'up', wc_dir_name, - *args) + if len(args) == 0: + args = (wc_dir_name,) - if error_re_string: - rm = re.compile(error_re_string) - match = None - for line in errput: - match = rm.search(line) - if match: - break - if not match: - raise main.SVNUnmatchedError + exit_code, output, errput = run_and_verify_svn(None, expected_stderr, 'up', *args) actual = wc.State.from_checkout(output) verify_update(actual, None, None, wc_dir_name, output_tree, None, None, disk_tree, status_tree, - singleton_handler_a, a_baton, - singleton_handler_b, b_baton, - check_props) + check_props, **kw) def run_and_parse_info(*args): @@ -1047,13 +1021,9 @@ def run_and_verify_merge(dir, rev1, rev2 elision_output_tree, disk_tree, status_tree, skip_tree, error_re_string = None, - singleton_handler_a = None, - a_baton = None, - singleton_handler_b = None, - b_baton = None, check_props = False, dry_run = True, - *args): + *args, **kw): """Run 'svn merge URL1@REV1 URL2@REV2 DIR' if URL2 is not None (for a three-way merge between URLs and WC). @@ -1216,9 +1186,7 @@ def run_and_verify_merge(dir, rev1, rev2 verify_update(actual_diff, actual_mergeinfo, actual_elision, dir, output_tree, mergeinfo_output_tree, elision_output_tree, disk_tree, status_tree, - singleton_handler_a, a_baton, - singleton_handler_b, b_baton, - check_props) + check_props, **kw) def run_and_verify_patch(dir, patch_path, @@ -1226,7 +1194,7 @@ def run_and_verify_patch(dir, patch_path error_re_string=None, check_props=False, dry_run=True, - *args): + *args, **kw): """Run 'svn patch patch_path DIR'. If ERROR_RE_STRING, 'svn patch' must exit with error, and the error @@ -1318,7 +1286,7 @@ def run_and_verify_patch(dir, patch_path verify_update(mytree, None, None, dir, output_tree, None, None, disk_tree, status_tree, - check_props=check_props) + check_props=check_props, **kw) def run_and_verify_mergeinfo(error_re_string = None, @@ -1361,54 +1329,31 @@ def run_and_verify_switch(wc_dir_name, wc_target, switch_url, output_tree, disk_tree, status_tree, - error_re_string = None, - singleton_handler_a = None, - a_baton = None, - singleton_handler_b = None, - b_baton = None, + expected_stderr = [], check_props = False, - *args): + *args, **kw): """Switch WC_TARGET (in working copy dir WC_DIR_NAME) to SWITCH_URL. - If ERROR_RE_STRING, the switch must exit with error, and the error - message must match regular expression ERROR_RE_STRING. - - Else if ERROR_RE_STRING is None, then: - The subcommand output will be verified against OUTPUT_TREE, and the working copy itself will be verified against DISK_TREE. If optional STATUS_TREE is given, then 'svn status' output will be compared. (This is a good way to check that revision numbers were bumped.) - For the DISK_TREE verification, SINGLETON_HANDLER_A and - SINGLETON_HANDLER_B will be passed to tree.compare_trees -- see that - function's doc string for more details. - If CHECK_PROPS is set, then disk comparison will examine props. Return if successful, raise on failure.""" # Update and make a tree of the output. - exit_code, output, errput = main.run_svn(error_re_string, 'switch', - switch_url, wc_target, *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) - elif errput: - raise verify.SVNUnexpectedStderr(err) - + exit_code, output, errput = run_and_verify_svn(None, expected_stderr, + 'switch', switch_url, + wc_target, *args) actual = wc.State.from_checkout(output) verify_update(actual, None, None, wc_dir_name, output_tree, None, None, disk_tree, status_tree, - singleton_handler_a, a_baton, - singleton_handler_b, b_baton, - check_props) + check_props, **kw) def process_output_for_commit(output, error_re_string): """Helper for run_and_verify_commit(), also used in the factory.""" @@ -1466,7 +1411,7 @@ def run_and_verify_commit(wc_dir_name, o be compared. (This is a good way to check that revision numbers were bumped.) - EXPECTED_STDERR is handled as run_and_verify_svn() + EXPECTED_STDERR is handled as in run_and_verify_svn() Return if successful, raise on failure.""" @@ -2256,7 +2201,7 @@ def build_greek_tree_conflicts(sbox): expected_disk = main.greek_state expected_status = get_virginal_state(wc_dir, 1) run_and_verify_update(wc_dir, expected_output, expected_disk, - expected_status, None, None, None, None, None, False, + expected_status, [], False, '-r', '1', wc_dir) # Make local changes Modified: subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/deeptrees.py Fri Feb 27 22:37:13 2015 @@ -498,8 +498,13 @@ def deep_trees_run_tests_scheme_for_upda x_status.copy() x_status.wc_dir = base + if test_case.error_re_string == None: + expected_stderr = [] + else: + expected_stderr = test_case.error_re_string + run_and_verify_update(base, x_out, x_disk, None, - error_re_string = test_case.error_re_string) + expected_stderr = expected_stderr) if x_status: run_and_verify_unquiet_status(base, x_status) @@ -585,8 +590,13 @@ def deep_trees_skipping_on_update(sbox, # Account for nodes that were updated by further_action x_status.tweak('', 'D', 'F', 'DD', 'DF', 'DDD', 'DDF', wc_rev=4) + if test_case.error_re_string == None: + expected_stderr = [] + else: + expected_stderr = test_case.error_re_string + run_and_verify_update(base, x_out, x_disk, None, - error_re_string = test_case.error_re_string) + expected_stderr = expected_stderr) run_and_verify_unquiet_status(base, x_status) @@ -745,8 +755,8 @@ def deep_trees_run_tests_scheme_for_swit x_status.wc_dir = local run_and_verify_switch(local, local, incoming, x_out, x_disk, None, - test_case.error_re_string, None, None, None, - None, False, '--ignore-ancestry') + test_case.error_re_string, False, + '--ignore-ancestry') run_and_verify_unquiet_status(local, x_status) x_info = test_case.expected_info or {} @@ -960,7 +970,6 @@ def deep_trees_run_tests_scheme_for_merg run_and_verify_merge(local, '0', 'HEAD', incoming, None, x_out, None, None, x_disk, None, x_skip, test_case.error_re_string, - None, None, None, None, False, False, *varargs) run_and_verify_unquiet_status(local, x_status) except: @@ -1077,7 +1086,7 @@ def do_routine_switching(wc_dir, repo_ur expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') else: svntest.main.run_svn(None, 'switch', '--ignore-ancestry', @@ -1113,7 +1122,7 @@ def do_routine_switching(wc_dir, repo_ur expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') else: svntest.main.run_svn(None, 'switch', '--ignore-ancestry', Modified: subversion/trunk/subversion/tests/cmdline/svntest/factory.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/factory.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/factory.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/factory.py Fri Feb 27 22:37:13 2015 @@ -634,13 +634,13 @@ class TestFactory: py += pychdir py += ("actions.run_and_verify_update(" + wc.py + ", " + "expected_output, expected_disk, expected_status, " + - "None, None, None, None, None, False") + "[], False") else: # write a test that expects error py = "expected_error = " + self.strlist2py(err) + "\n\n" py += pychdir py += ("actions.run_and_verify_update(" + wc.py + ", None, None, " + - "None, expected_error, None, None, None, None, False") + "None, expected_error") if len(pyargs) > 0: py += ', ' + ', '.join(pyargs) @@ -700,14 +700,14 @@ class TestFactory: py += ("actions.run_and_verify_switch(" + wc.py + ", " + wc_arg.pyarg + ", " + url_arg.pyarg + ", " + "expected_output, expected_disk, expected_status, " + - "None, None, None, None, None, False") + "[], False") else: # write a test that expects error py = "expected_error = " + self.strlist2py(err) + "\n\n" py += pychdir py += ("actions.run_and_verify_switch(" + wc.py + ", " + wc_arg.pyarg + ", " + url_arg.pyarg + ", " + - "None, None, None, expected_error, None, None, None, None, False") + "None, None, None, expected_error, False") if len(pyargs) > 0: py += ', ' + ', '.join(pyargs) @@ -765,7 +765,7 @@ class TestFactory: py += ("actions.run_and_verify_checkout(" + url_arg.pyarg + ", " + wc_arg.pyarg + - ", expected_output, expected_disk, None, None, None, None") + ", expected_output, expected_disk") else: # write a test that expects failure pylist = self.strlist2py(err) Modified: subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py Fri Feb 27 22:37:13 2015 @@ -197,7 +197,7 @@ def set_up_dir_replace(sbox): expected_disk, expected_status, expected_skip, - None, None, None, None, None, 1) + check_props=True) # Commit merge of foo onto C, creating r3. expected_output = wc.State(wc_dir, { 'A/C' : Item(verb='Sending'), Modified: subversion/trunk/subversion/tests/cmdline/svntest/tree.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/tree.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/tree.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/tree.py Fri Feb 27 22:37:13 2015 @@ -610,6 +610,11 @@ def detect_conflict_files(node, extra_fi logger.warn(str(node)) raise SVNTreeUnequal(msg) +def detect_conflict_files_done(extra_files): + """Done handler for detect_conflict_files""" + if len(extra_files): + raise SVNTreeError("Not all extra reject files have been accounted for") + ########################################################################### ########################################################################### # EXPORTED ROUTINES ARE BELOW Modified: subversion/trunk/subversion/tests/cmdline/svnversion_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svnversion_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svnversion_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/svnversion_tests.py Fri Feb 27 22:37:13 2015 @@ -102,7 +102,7 @@ def svnversion_test(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry'): raise svntest.Failure @@ -151,8 +151,7 @@ def svnversion_test(sbox): }) svntest.actions.run_and_verify_checkout(repo_url + "/A", A_A_path, expected_output, expected_disk, - None, None, None, None, - "--depth=files") + [], "--depth=files") # Partial (sparse) checkout svntest.actions.run_and_verify_svnversion(A_A_path, Modified: subversion/trunk/subversion/tests/cmdline/switch_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/switch_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/switch_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/switch_tests.py Fri Feb 27 22:37:13 2015 @@ -189,8 +189,7 @@ def full_rev_update(sbox): expected_output, expected_disk, expected_status, - None, None, None, - None, None, 1, + [], True, '-r', '1', wc_dir) #---------------------------------------------------------------------- @@ -247,8 +246,7 @@ def update_switched_things(sbox): expected_output, expected_disk, expected_status, - None, None, None, - None, None, 0, + [], False, B_path, iota_path) @@ -305,8 +303,7 @@ def rev_update_switched_things(sbox): expected_output, expected_disk, expected_status, - None, None, None, - None, None, 1, + [], True, '-r', '1', B_path, iota_path) @@ -374,8 +371,8 @@ def delete_subdir(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, - False, '--ignore-ancestry') + [], False, + '--ignore-ancestry') #---------------------------------------------------------------------- # Issue 1532: Switch a file to a dir: can't switch it back to the file @@ -589,8 +586,9 @@ def bad_intermediate_urls(sbox): }) actions.run_and_verify_switch(wc_dir, wc_dir, url_A_C, expected_output, - expected_disk, expected_status, None, None, - None, None, None, False, '--ignore-ancestry') + expected_disk, expected_status, + [], False, + '--ignore-ancestry') # However, the URL for wc/A should now reflect ^/A/C/A, not something else. expected_infos = [ @@ -614,7 +612,7 @@ def bad_intermediate_urls(sbox): expected_status.tweak('A/Z', treeconflict=None) actions.run_and_verify_update(wc_dir, expected_output, expected_disk, - expected_status, None, None, None, None, None, False, wc_dir) + expected_status) @@ -685,8 +683,8 @@ def obstructed_switch(sbox): actions.run_and_verify_switch(wc_dir, A_B_E, url_A_B_Esave, expected_output, expected_disk, - expected_status, None, None, None, None, - None, False, '--ignore-ancestry') + expected_status, + [], False, '--ignore-ancestry') # svn status expected_status.add({ @@ -742,7 +740,7 @@ def commit_mods_below_switch(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') D_path = sbox.ospath('A/D') @@ -821,7 +819,7 @@ def refresh_read_only_attribute(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') # The file with we set svn:needs-lock on should now be writable, but @@ -944,8 +942,7 @@ def forced_switch(sbox): svntest.actions.run_and_verify_switch(sbox.wc_dir, F_path, AD_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, [], False, '--force', '--ignore-ancestry') #---------------------------------------------------------------------- @@ -1060,8 +1057,8 @@ def forced_switch_failures(sbox): expected_status.tweak('A/C', switched='S') actions.run_and_verify_switch(wc_dir, A_C, url_A_D, expected_output, - expected_disk, expected_status, None, None, - None, None, None, False, '--force', + expected_disk, expected_status, [], False, + '--force', '--ignore-ancestry') @@ -1087,8 +1084,8 @@ def forced_switch_failures(sbox): expected_status.tweak('A/B/F', switched='S') actions.run_and_verify_switch(wc_dir, A_B_F, url_A_D_G, expected_output, - expected_disk, expected_status, None, None, - None, None, None, False, '--force', + expected_disk, expected_status, [], False, + '--force', '--ignore-ancestry') # svn info A/B/F/pi @@ -1141,9 +1138,8 @@ def forced_switch_failures(sbox): }) actions.run_and_verify_switch(wc_dir, A_D_G, url_A_D_H, expected_output, - None, None, None, - None, None, None, None, - False, '--force', '--ignore-ancestry') + None, None, [], False, + '--force', '--ignore-ancestry') # Delete all three obstructions and finish the update. # rm -rf A/D/G/I @@ -1202,7 +1198,7 @@ def forced_switch_failures(sbox): svntest.main.run_svn(None, 'revert', '-R', sbox.ospath('A/C/H')) actions.run_and_verify_update(wc_dir, expected_output, expected_disk, - expected_status, None, None, None, None, None, False, wc_dir) + expected_status) def switch_with_obstructing_local_adds(sbox): @@ -1281,9 +1277,6 @@ def switch_with_obstructing_local_adds(s 'A/B/F/I' : Item(status='A ', wc_rev='-', entry_rev='0'), }) - # "Extra" files that we expect to result from the conflicts. - extra_files = ['pi\.r0', 'pi\.r1', 'pi\.mine'] - # Do the switch and check the results in three ways. F_path = sbox.ospath('A/B/F') D_url = sbox.repo_url + '/A/D' @@ -1292,9 +1285,7 @@ def switch_with_obstructing_local_adds(s expected_output, expected_disk, expected_status, - None, - svntest.tree.detect_conflict_files, - extra_files, None, None, False, + [], False, '--ignore-ancestry') #---------------------------------------------------------------------- @@ -1445,8 +1436,7 @@ def mergeinfo_switch_elision(sbox): expected_merge_disk, expected_merge_status, expected_skip, - None, None, None, None, - None, 1) + check_props=True) # r5 - Commit the merge into A/B_COPY_1/E expected_output = svntest.wc.State( @@ -1491,8 +1481,7 @@ def mergeinfo_switch_elision(sbox): expected_merge_disk, expected_merge_status, expected_skip, - None, None, None, None, - None, 1) + check_props=True) # Switch A/B_COPY_2 to URL of A/B_COPY_1. The local mergeinfo for r1,3-4 # on A/B_COPY_2/E is identical to the mergeinfo added to A/B_COPY_2 as a @@ -1546,7 +1535,7 @@ def mergeinfo_switch_elision(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, True, + [], True, '--ignore-ancestry') # Now check a switch which reverses and earlier switch and leaves @@ -1568,7 +1557,7 @@ def mergeinfo_switch_elision(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, True, + [], True, '--ignore-ancestry') svntest.actions.run_and_verify_svn(["property '" + SVN_PROP_MERGEINFO + @@ -1589,7 +1578,7 @@ def mergeinfo_switch_elision(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, True, + [], True, '--ignore-ancestry') #---------------------------------------------------------------------- @@ -1619,8 +1608,8 @@ def switch_with_depth(sbox): svntest.actions.run_and_verify_switch(wc_dir, AB_path, AD_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '--depth', 'empty', '--ignore-ancestry') # Set up expected results for reverting 'switch --depth=empty' @@ -1631,8 +1620,8 @@ def switch_with_depth(sbox): svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '--depth', 'empty', '--ignore-ancestry') # Set up expected results of 'switch --depth=files' @@ -1658,8 +1647,8 @@ def switch_with_depth(sbox): svntest.actions.run_and_verify_switch(wc_dir, AB_path, AD_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '--depth', 'files', '--ignore-ancestry') # Set up expected results for reverting 'switch --depth=files' @@ -1673,8 +1662,8 @@ def switch_with_depth(sbox): svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '--depth', 'files', '--ignore-ancestry') # Putting the depth=immediates stuff in a subroutine, because we're @@ -1711,8 +1700,8 @@ def switch_with_depth(sbox): svntest.actions.run_and_verify_switch(wc_dir, AB_path, AD_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '--depth', 'immediates', '--ignore-ancestry') @@ -1736,8 +1725,8 @@ def switch_with_depth(sbox): svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '--ignore-ancestry') # Okay, repeat 'switch --depth=immediates'. (Afterwards we'll @@ -1762,8 +1751,8 @@ def switch_with_depth(sbox): svntest.actions.run_and_verify_switch(wc_dir, AB_path, AB_url, expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '--depth', 'infinity', '--ignore-ancestry') @@ -1823,8 +1812,8 @@ def switch_to_dir_with_peg_rev(sbox): svntest.actions.run_and_verify_switch(wc_dir, X_path, ADG_url + '@3', expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, + [], False, '-r', '2', '--ignore-ancestry') def switch_urls_with_spaces(sbox): @@ -1870,7 +1859,7 @@ def switch_urls_with_spaces(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') # Test 2: switch file 'bar baz bal' to 'tau pau mau' @@ -1897,7 +1886,7 @@ def switch_urls_with_spaces(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') def switch_to_dir_with_peg_rev2(sbox): @@ -1960,8 +1949,7 @@ def switch_to_dir_with_peg_rev2(sbox): svntest.actions.run_and_verify_switch(wc_dir, X_path, ADY_url + '@HEAD', expected_output, expected_disk, - expected_status, None, - None, None, None, None, False, + expected_status, [], False, '-r', '2', '--ignore-ancestry') def switch_to_root(sbox): @@ -2013,7 +2001,7 @@ def switch_to_root(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') #---------------------------------------------------------------------- @@ -2066,7 +2054,7 @@ def tolerate_local_mods(sbox): expected_output, expected_disk, expected_status, - None, None, None, None, None, + [], False, '--ignore-ancestry') #---------------------------------------------------------------------- @@ -2667,7 +2655,7 @@ def different_node_kind(sbox): expected_status.add_state(rel_path, pristine_status.subtree(rel_url)) svntest.actions.run_and_verify_switch(sbox.wc_dir, full_path, full_url, None, expected_disk, expected_status, - None, None, None, None, None, False, + [], False, '--ignore-ancestry') svntest.actions.run_and_verify_svn(None, [], 'info', full_path) if not os.path.isdir(full_path): @@ -2683,7 +2671,7 @@ def different_node_kind(sbox): expected_status.tweak(rel_path, switched='S') svntest.actions.run_and_verify_switch(sbox.wc_dir, full_path, full_url, None, expected_disk, expected_status, - None, None, None, None, None, False, + [], False, '--ignore-ancestry') svntest.actions.run_and_verify_svn(None, [], 'info', full_path) if not os.path.isfile(full_path): @@ -2748,15 +2736,15 @@ def switch_across_replacement(sbox): }) svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None, None, - None, None, None, None, None, False, + [], False, '-r1') svntest.actions.run_and_verify_update(sbox.wc_dir, expected_output, None, None, - None, None, None, None, None, False, + [], False, '-r2') svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath('A'), '^/A', expected_output, None, None, - None, None, None, None, None, False, + [], False, '-r1') @Issue(1975) @@ -2779,8 +2767,7 @@ def switch_keywords(sbox): contents="$URL: %s/A/D/H/psi $\n" % sbox.repo_url) svntest.actions.run_and_verify_update(sbox.wc_dir, - None, expected_disk, - None, None, None, None, None, None) + None, expected_disk, None) sbox.simple_copy('A', 'A_copy') sbox.simple_commit() sbox.simple_update() @@ -2844,8 +2831,7 @@ def switch_keywords(sbox): # both gamma and psi should have update URLs after the switch svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath('A'), '^/A_copy', - None, expected_disk, expected_status, - None, None, None, None, None) + None, expected_disk, expected_status) @Issue(4524) def switch_moves(sbox): @@ -2886,8 +2872,7 @@ def switch_moves(sbox): # It would be nice if we could handle the tree conflict more intelligent, as # the working copy matches the incomming change. svntest.actions.run_and_verify_switch(sbox.wc_dir, sbox.ospath(''), branch_url, - None, expected_disk, expected_status, - None, None, None, None, None) + None, expected_disk, expected_status) ######################################################################## Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Fri Feb 27 22:37:13 2015 @@ -534,11 +534,10 @@ def update_modified_with_translation(sbo svntest.actions.run_and_verify_update(wc_dir, expected_output, expected_disk, - None, None, - svntest.tree.detect_conflict_files, - extra_files, - None, None, - 0, '-r', '1', wc_dir) + None, + [], False, + '-r', '1', wc_dir, + extra_files=extra_files) #---------------------------------------------------------------------- @@ -850,9 +849,7 @@ def props_only_file_update(sbox): svntest.actions.run_and_verify_update(wc_dir, None, None, expected_status, - None, - None, None, None, None, - False, + [], False, wc_dir, '-r', '2') if open(iota_path).read() != ''.join(content_expanded): @@ -865,11 +862,7 @@ def props_only_file_update(sbox): expected_status = svntest.actions.get_virginal_state(wc_dir, 3) svntest.actions.run_and_verify_update(wc_dir, - None, expected_disk, expected_status, - None, - None, None, None, None, - False, - wc_dir) + None, expected_disk, expected_status) if open(iota_path).read() != ''.join(content): raise svntest.Failure("$Author$ is not contracted in 'iota'") 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=1662838&r1=1662837&r2=1662838&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Fri Feb 27 22:37:13 2015 @@ -802,8 +802,7 @@ def force_del_tc_inside(sbox): }) run_and_verify_update(wc_dir, expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, - wc_dir) + check_props=True) # Delete A/C with --force, in effect disarming the tree-conflicts. run_and_verify_svn(verify.UnorderedOutput(['D ' + C + '\n', @@ -886,8 +885,7 @@ def force_del_tc_is_target(sbox): }) run_and_verify_update(wc_dir, expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, - wc_dir) + check_props=True) # Delete nodes with --force, in effect disarming the tree-conflicts. run_and_verify_svn(['D ' + dir + '\n', @@ -954,8 +952,7 @@ def query_absent_tree_conflicted_dir(sbo treeconflict='C')}) run_and_verify_update(wc_dir, expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, - wc_dir) + check_props=True) # Delete A/C with --keep-local. run_and_verify_svn(verify.UnorderedOutput(['D ' + C_C_path + '\n', @@ -1028,8 +1025,7 @@ def up_add_onto_add_revert(sbox): run_and_verify_update(wc2_dir, None, expected_disk, expected_status, - None, None, None, None, None, 1, - wc2_dir) + check_props=True) # Currently (r927086), this removes dir2 and file2 in a way that # they don't reappear after update. @@ -1046,8 +1042,7 @@ def up_add_onto_add_revert(sbox): # the repository run_and_verify_update(wc2_dir, None, expected_disk, expected_status, - None, None, None, None, None, 1, - wc2_dir) + check_props=True) #---------------------------------------------------------------------- @@ -1084,8 +1079,7 @@ def lock_update_only(sbox): expected_status.tweak('iota', status='D ', writelocked='K') run_and_verify_update(wc_dir, None, expected_disk, expected_status, - None, None, None, None, None, 1, - wc_dir) + check_props=True) #---------------------------------------------------------------------- @@ -1487,8 +1481,7 @@ def update_delete_mixed_rev(sbox): expected_status.tweak('A/B/E', status='A ', entry_status=' ') run_and_verify_update(wc_dir, expected_output, expected_disk, expected_status, - None, None, None, None, None, 1, - wc_dir) + check_props=True) # Resolving to working state should give a mixed-revision copy that # gets committed as multiple copies