Author: stsp
Date: Wed Dec 19 20:00:13 2012
New Revision: 1424063
URL: http://svn.apache.org/viewvc?rev=1424063&view=rev
Log:
Follow-up to r1424052: Fix test fallout.
* subversion/svn/svn.c
(sub_main): Force --non-interactive to FALSE if --force-interactive was given.
* subversion/tests/cmdline/basic_tests.py
(automatic_conflict_resolution): Pass --force-interactive when testing
the --accept=edit and --accept=launch options to keep this test passing.
* subversion/tests/cmdline/update_tests.py
(update_accept_conflicts): Same as previous.
Modified:
subversion/trunk/subversion/svn/svn.c
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/svn/svn.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1424063&r1=1424062&r2=1424063&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/svn.c (original)
+++ subversion/trunk/subversion/svn/svn.c Wed Dec 19 20:00:13 2012
@@ -2209,11 +2209,12 @@ sub_main(int argc, const char *argv[], a
"are mutually exclusive"));
return EXIT_ERROR(err);
}
-
/* If neither --non-interactive nor --force-interactive was passed,
* and stdin is not a terminal, set --non-interactive. */
- if (!opt_state.force_interactive && !opt_state.non_interactive)
- opt_state.non_interactive = !svn_cmdline__stdin_isatty();
+ else if (!opt_state.force_interactive && !opt_state.non_interactive)
+ opt_state.non_interactive = !svn_cmdline__stdin_isatty();
+ else if (opt_state.force_interactive)
+ opt_state.non_interactive = FALSE;
/* Turn our hash of changelists into an array of unique ones. */
SVN_INT_ERR(svn_hash_keys(&(opt_state.changelists), changelists, pool));
Modified: subversion/trunk/subversion/tests/cmdline/basic_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/basic_tests.py?rev=1424063&r1=1424062&r2=1424063&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/basic_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/basic_tests.py Wed Dec 19
20:00:13 2012
@@ -2249,12 +2249,14 @@ def automatic_conflict_resolution(sbox):
# stdout, stderr
None,
".*invalid 'accept' ARG",
- 'resolve', '--accept=edit')
+ 'resolve', '--accept=edit',
+ '--force-interactive')
svntest.actions.run_and_verify_svn(None,
# stdout, stderr
None,
".*invalid 'accept' ARG",
- 'resolve', '--accept=launch')
+ 'resolve', '--accept=launch',
+ '--force-interactive')
# Run 'svn resolved --accept=NOPE. Using omega for the test.
svntest.actions.run_and_verify_svn("Resolve command", None,
".*NOPE' is not a valid --accept value",
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=1424063&r1=1424062&r2=1424063&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Wed Dec 19
20:00:13 2012
@@ -3966,6 +3966,7 @@ def update_accept_conflicts(sbox):
% (pi_path_backup)],
"system(.*) returned.*", 0,
'update', '--accept=edit',
+ '--force-interactive',
pi_path_backup)
# rho: --accept=launch
@@ -3978,6 +3979,7 @@ def update_accept_conflicts(sbox):
' Text conflicts: 1\n'],
[],
'update', '--accept=launch',
+ '--force-interactive',
rho_path_backup)
# Set the expected disk contents for the test
