Author: stsp
Date: Mon Aug 21 12:49:42 2017
New Revision: 1805627
URL: http://svn.apache.org/viewvc?rev=1805627&view=rev
Log:
Follow-up to r1805620: Fix test fallout.
Some tests were implicitly relying on the fact that the --non-interactive
option implied --accept=postpone.
* subversion/tests/cmdline/merge_tests.py
(merge_target_selection): Make --accept=postpone explicit.
* subversion/tests/cmdline/merge_tree_conflict_tests.py
(merge_replace_causes_tree_conflict,
merge_replace_causes_tree_conflict2,
merge_replace_on_del_fails): Likewise.
* subversion/tests/cmdline/stat_tests.py
(status_missing_conflicts): Likewise.
* subversion/tests/cmdline/svntest/mergetrees.py
(svn_merge): Likewise.
* subversion/tests/cmdline/tree_conflict_tests.py
(ensure_tree_conflict): Likewise.
Modified:
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_tests.py?rev=1805627&r1=1805626&r2=1805627&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Mon Aug 21
12:49:42 2017
@@ -17395,7 +17395,8 @@ def merge_target_selection(sbox):
' U .\n',
] + svntest.main.summary_of_conflicts(tree_conflicts=1)
svntest.actions.run_and_verify_svn(expected_output, [],
- 'merge', '^/dir/binary-file', '-c', '4',
'.')
+ 'merge', '^/dir/binary-file',
+ '-c', '4', '.', '--accept', 'postpone')
svntest.main.run_svn(None, 'revert', '-R', '.')
@@ -17407,7 +17408,8 @@ def merge_target_selection(sbox):
' U binary-file\n',
] + svntest.main.summary_of_conflicts(tree_conflicts=1)
svntest.actions.run_and_verify_svn(expected_output, [],
- 'merge', '^/dir', '-c', '4',
'binary-file')
+ 'merge', '^/dir', '-c', '4',
'binary-file',
+ '--accept', 'postpone')
@SkipUnless(server_has_mergeinfo)
@Issue(3405) # seems to be the wrong issue number
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=1805627&r1=1805626&r2=1805627&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py
(original)
+++ subversion/trunk/subversion/tests/cmdline/merge_tree_conflict_tests.py Mon
Aug 21 12:49:42 2017
@@ -1695,7 +1695,7 @@ def merge_replace_causes_tree_conflict(s
], target=A, two_url=True, tree_conflicts=4)
actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
- url_A, url_branch, A)
+ url_A, url_branch, A, '--accept=postpone')
# svn st
expected_status.tweak('A', status=' M')
@@ -1781,7 +1781,7 @@ def merge_replace_causes_tree_conflict2(
], target=A, two_url=True, tree_conflicts=1)
actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
- url_A, url_branch, A, '--depth=files')
+ url_A, url_branch, A, '--depth=files', '--accept=postpone')
# New mergeinfo describing the merge.
expected_status.tweak('A', status=' M')
# Currently this fails because the local status is 'D'eleted rather than
@@ -1801,7 +1801,7 @@ def merge_replace_causes_tree_conflict2(
], target=A_B, two_url=True, tree_conflicts=1)
actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
- url_A_B, url_branch_B, A_B)
+ url_A_B, url_branch_B, A_B, '--accept=postpone')
# New mergeinfo describing the merge.
expected_status.tweak('A/B', status=' M')
# Currently this fails because the local status shows a property mod (and
@@ -1821,7 +1821,7 @@ def merge_replace_causes_tree_conflict2(
], target=A_D, two_url=True, tree_conflicts=1)
actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
- '--depth=immediates', url_A_D, url_branch_D, A_D)
+ '--depth=immediates', url_A_D, url_branch_D, A_D, '--accept=postpone')
# New mergeinfo describing the merge.
expected_status.tweak('A/D', 'A/D/G', status=' M')
# Currently this fails because the local status is 'D'eleted rather than
@@ -1841,7 +1841,7 @@ def merge_replace_causes_tree_conflict2(
], target=A_D_G, two_url=True, tree_conflicts=1)
actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
- url_A_D_G, url_branch_D_G, A_D_G)
+ url_A_D_G, url_branch_D_G, A_D_G, '--accept=postpone')
# New mergeinfo describing the merge.
expected_status.tweak('A/D/G', status=' M')
# Currently this fails because the local status shows a property mod (and
@@ -1932,7 +1932,7 @@ def merge_replace_on_del_fails(sbox):
# cmdline\svn-test-work\working_copies\merge_tree_conflict_tests-24\
# branch\C' was not found.
actions.run_and_verify_svn2(expected_stdout, [], 0, 'merge',
- sbox.repo_url + '/A', branch_path)
+ sbox.repo_url + '/A', branch_path, '--accept=postpone')
def merge_conflict_details(sbox):
"merge conflict details"
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=1805627&r1=1805626&r2=1805627&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Mon Aug 21 12:49:42
2017
@@ -2224,7 +2224,8 @@ def status_missing_conflicts(sbox):
sbox.simple_rm('A/B/E')
- sbox.simple_update('A/B/E', revision=1)
+ svntest.main.run_svn(False, 'update', sbox.ospath('A/B/E'), '-r', '1',
+ '--accept=postpone')
expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
expected_status.tweak('A/B/E', status='D ', treeconflict='C', wc_rev=1)
@@ -2277,7 +2278,8 @@ def status_missing_conflicts(sbox):
sbox.simple_move('A/B/E/beta', 'beta')
sbox.simple_rm('A/B/E')
- sbox.simple_update('A/B/E', revision=1)
+ svntest.main.run_svn(False, 'update', sbox.ospath('A/B/E'), '-r', '1',
+ '--accept=postpone')
svntest.actions.run_and_verify_svn(None, [],
'resolve', '--accept=mine-conflict',
'--depth=empty', sbox.ospath('A/B/E'))
Modified: subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py?rev=1805627&r1=1805626&r2=1805627&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/mergetrees.py Mon Aug 21
12:49:42 2017
@@ -446,7 +446,8 @@ def svn_merge(rev_range, source, target,
prop_resolved=prop_resolved,
tree_resolved=tree_resolved)
actions.run_and_verify_svn(exp_out, [],
- 'merge', rev_arg, source, target, *args)
+ 'merge', rev_arg, source, target,
+ '--accept=postpone', *args)
#----------------------------------------------------------------------
# Setup helper for issue #4056 and issue #4057 tests.
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=1805627&r1=1805626&r2=1805627&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Mon Aug 21
12:49:42 2017
@@ -463,7 +463,7 @@ def ensure_tree_conflict(sbox, operation
if operation == 'update':
logger.debug("--- Updating")
run_and_verify_svn(expected_stdout, [],
- 'update', target_path)
+ 'update', target_path, '--accept=postpone')
elif operation == 'switch':
logger.debug("--- Switching")
run_and_verify_svn(expected_stdout, [],
