diff options
author | Ingela Anderton Andin <[email protected]> | 2015-06-17 16:47:06 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2015-06-22 16:02:57 +0200 |
commit | 287ab39e946b4578d755038989ad50ccfb95f575 (patch) | |
tree | 71e45c64337a001f7674b308fd20e101d8d49d1b /lib/ssl/test/ssl_handshake_SUITE.erl | |
parent | 2be7b33f26fc950c2f807e1f9fbc19fde83facd0 (diff) | |
download | otp-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_handshake_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_handshake_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_handshake_SUITE.erl b/lib/ssl/test/ssl_handshake_SUITE.erl index 7ee5f50b58..eaa5554dae 100644 --- a/lib/ssl/test/ssl_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_handshake_SUITE.erl @@ -65,7 +65,9 @@ init_per_testcase(ignore_hassign_extension_pre_tls_1_2, Config0) -> (catch make_certs:all(?config(data_dir, Config0), ?config(priv_dir, Config0))), ct:log("Make certs ~p~n", [Result]), - ssl_test_lib:cert_options(Config0); + Config = ssl_test_lib:cert_options(Config0), + ct:timetrap({seconds, 5}), + Config; false -> {skip, "Crypto did not support sha512"} end |