Re: svn commit: r1805627 - in /subversion/trunk/subversion/tests/cmdline: merge_tests.py merge_tree_conflict_tests.py stat_tests.py svntest/mergetrees.py tree_conflict_tests.py

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805627 - in /subversion/trunk/subversion/tests/cmdline: merge_tests.py merge_tree_conflict_tests.py stat_tests.py svntest/mergetrees.py tree_conflict_tests.py

Daniel Shahaf-2
[hidden email] wrote on Mon, 21 Aug 2017 12:49 +0000:

> 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.
>

Seeing as this patch changed test expectations, I assume it requires a
release notes patch?  (to inform users who are doing what the test did
until this revision)

> * subversion/tests/cmdline/merge_tests.py
>   (merge_target_selection): Make --accept=postpone explicit.
>
> 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')
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1805627 - in /subversion/trunk/subversion/tests/cmdline: merge_tests.py merge_tree_conflict_tests.py stat_tests.py svntest/mergetrees.py tree_conflict_tests.py

Stefan Sperling-9
On Wed, Aug 23, 2017 at 04:09:55PM +0000, Daniel Shahaf wrote:

> [hidden email] wrote on Mon, 21 Aug 2017 12:49 +0000:
> > 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.
> >
>
> Seeing as this patch changed test expectations, I assume it requires a
> release notes patch?  (to inform users who are doing what the test did
> until this revision)

Indeed. Done in r1805937.