aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_upgrade_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-06-17 16:47:06 +0200
committerIngela Anderton Andin <[email protected]>2015-06-22 16:02:57 +0200
commit287ab39e946b4578d755038989ad50ccfb95f575 (patch)
tree71e45c64337a001f7674b308fd20e101d8d49d1b /lib/ssl/test/ssl_upgrade_SUITE.erl
parent2be7b33f26fc950c2f807e1f9fbc19fde83facd0 (diff)
downloadotp-287ab39e946b4578d755038989ad50ccfb95f575.tar.gz
otp-287ab39e946b4578d755038989ad50ccfb95f575.tar.bz2
otp-287ab39e946b4578d755038989ad50ccfb95f575.zip
ssl: modernize timetrap handling
Watchdog is legacy test_server use only ct:timetrap/1
Diffstat (limited to 'lib/ssl/test/ssl_upgrade_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_upgrade_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl
index c83fb367dc..b09be4b278 100644
--- a/lib/ssl/test/ssl_upgrade_SUITE.erl
+++ b/lib/ssl/test/ssl_upgrade_SUITE.erl
@@ -61,8 +61,11 @@ end_per_suite(Config) ->
crypto:stop().
init_per_testcase(_TestCase, Config) ->
+ ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]),
+ ct:timetrap({minutes, 1}),
Config.
-end_per_testcase(_TestCase, Config) ->
+
+end_per_testcase(_TestCase, Config) ->
Config.
major_upgrade(Config) when is_list(Config) ->