Author: julianfoad
Date: Thu Nov 26 17:08:35 2009
New Revision: 884648
URL: http://svn.apache.org/viewvc?rev=884648&view=rev
Log:
In all tests that create their own config file, include the config option
"password-stores=" which is present in the default config. Some tests already
did so; these two did not.
The failure mode this prevents is if the dynamic auth libraries (gnome-keyring
and kwallet) fail to load, and if svn is compiled with SVN_DEBUG, then a
warning message is printed by svn_dso_load() on stderr which is seen by the
test suite as unexpected output and therefore a failure. The message is only
printed when compiled for debugging.
We may also want to remove the debug message, as an additional change.
* subversion/tests/cmdline/stat_tests.py
(timestamp_behaviour): Add "password-stores=" to the config.
* subversion/tests/cmdline/update_tests.py
(eof_in_interactive_conflict_resolver): Add "password-stores=" to the config.
Modified:
subversion/trunk/subversion/tests/cmdline/stat_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/stat_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/stat_tests.py?rev=884648&r1=884647&r2=884648&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/stat_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/stat_tests.py Thu Nov 26 17:08:35
2009
@@ -636,6 +636,9 @@
config_dir = os.path.join(os.path.abspath(svntest.main.temp_dir),
'use_commit_config')
config_contents = '''\
+[auth]
+password-stores =
+
[miscellany]
use-commit-times = yes
'''
Modified: subversion/trunk/subversion/tests/cmdline/update_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/update_tests.py?rev=884648&r1=884647&r2=884648&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/update_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/update_tests.py Thu Nov 26
17:08:35 2009
@@ -3839,6 +3839,9 @@
# Set up a custom config directory which *doesn't* turn off
# interactive resolution
config_contents = '''\
+[auth]
+password-stores =
+
[miscellany]
interactive-conflicts = true
'''
