aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_session_cache_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-11-30 16:34:18 +0100
committerIngela Anderton Andin <[email protected]>2010-11-30 16:34:18 +0100
commitdbc3c1f73de77191477f2325a23ea0e3bf456e9f (patch)
tree60a8491a098aaa62096f68c6dd9890c87950b3e3 /lib/ssl/test/ssl_session_cache_SUITE.erl
parente97fb4c5b40c1263ddc3142ab668d7e41c23721b (diff)
downloadotp-dbc3c1f73de77191477f2325a23ea0e3bf456e9f.tar.gz
otp-dbc3c1f73de77191477f2325a23ea0e3bf456e9f.tar.bz2
otp-dbc3c1f73de77191477f2325a23ea0e3bf456e9f.zip
Updated tests to avoid test case failure for non interesting reasons
Such reason is that pulic key generation or mnesia:stop might occasionally take very long time.
Diffstat (limited to 'lib/ssl/test/ssl_session_cache_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_session_cache_SUITE.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index 7a441e4599..0f39759d97 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -28,6 +28,7 @@
-define(SLEEP, 500).
-define(TIMEOUT, 60000).
+-define(LONG_TIMEOUT, 600000).
-behaviour(ssl_session_cache_api).
%% For the session cache tests
@@ -45,7 +46,7 @@
%% variable, but should NOT alter/remove any existing entries.
%%--------------------------------------------------------------------
init_per_suite(Config0) ->
- Dog = ssl_test_lib:timetrap(?TIMEOUT *2),
+ Dog = ssl_test_lib:timetrap(?LONG_TIMEOUT *2),
crypto:start(),
application:start(public_key),
ssl:start(),
@@ -119,7 +120,7 @@ end_per_testcase(session_cache_process_list, Config) ->
end_per_testcase(session_cache_process_mnesia, Config) ->
application:unset_env(ssl, session_cb),
application:unset_env(ssl, session_cb_init_args),
- mnesia:stop(),
+ mnesia:kill(),
ssl:stop(),
ssl:start(),
end_per_testcase(default_action, Config);