You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sb...@apache.org on 2010/08/23 18:16:21 UTC
svn commit: r988175 -
/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
Author: sbutler
Date: Mon Aug 23 16:16:21 2010
New Revision: 988175
URL: http://svn.apache.org/viewvc?rev=988175&view=rev
Log:
Follow-up to r988144: tweak the args of run_and_verify_merge() in a
couple of test cases. We skipped them while testing via ra_local.
* subversion/tests/cmdline/merge_authz_tests.py:
(mergeinfo_and_skipped_paths,
reintegrate_fails_if_no_root_access): Add target-path to *args.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py?rev=988175&r1=988174&r2=988175&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py Mon Aug 23 16:16:21 2010
@@ -393,7 +393,8 @@ def mergeinfo_and_skipped_paths(sbox):
expected_status,
expected_skip,
None, None, None, None,
- None, 1, 0, '-c5', '-c8')
+ None, 1, 0, '-c5', '-c8',
+ A_COPY_2_H_path)
# Test issue #2829 'Improve handling for skipped paths encountered
# during a merge'
@@ -697,7 +698,7 @@ def reintegrate_fails_if_no_root_access(
expected_skip,
None, None, None, None,
None, True, True,
- '--reintegrate')
+ '--reintegrate', A_path)
########################################################################
# Run the tests