aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-05-31 15:36:55 +0200
committerIngela Anderton Andin <[email protected]>2016-05-31 15:36:55 +0200
commitd4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d (patch)
tree69cbe3a1899f08644ef745c311dcfd45699cdf3c /lib/ssl
parent78b50b543395f9af748e2b00afb8c0266e708514 (diff)
parent9420a3f8abbc66e073b370613cfb7f218b97818b (diff)
downloadotp-d4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d.tar.gz
otp-d4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d.tar.bz2
otp-d4030f6e329b33bc5e5a3c7952c7e7d466bd7b2d.zip
Merge branch 'ingela/ssl/test-timeouts'
* ingela/ssl/test-timeouts: ssl: Increase timeouts due to slow test machines
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/ssl_packet_SUITE.erl2
-rw-r--r--lib/ssl/test/ssl_session_cache_SUITE.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_packet_SUITE.erl b/lib/ssl/test/ssl_packet_SUITE.erl
index 6a73acb704..042d57c0e2 100644
--- a/lib/ssl/test/ssl_packet_SUITE.erl
+++ b/lib/ssl/test/ssl_packet_SUITE.erl
@@ -167,7 +167,7 @@ end_per_group(_GroupName, Config) ->
Config.
init_per_testcase(_TestCase, Config) ->
- ct:timetrap({seconds, 30}),
+ ct:timetrap({seconds, 90}),
Config.
diff --git a/lib/ssl/test/ssl_session_cache_SUITE.erl b/lib/ssl/test/ssl_session_cache_SUITE.erl
index 5e6137d2a6..b352844ba0 100644
--- a/lib/ssl/test/ssl_session_cache_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_SUITE.erl
@@ -118,7 +118,7 @@ init_customized_session_cache(Type, Config) ->
Config)),
ets:new(ssl_test, [named_table, public, set]),
ets:insert(ssl_test, {type, Type}),
- ct:timetrap({seconds, 5}),
+ ct:timetrap({seconds, 20}),
Config.
end_per_testcase(session_cache_process_list, Config) ->