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_certificate_verify_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_certificate_verify_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_certificate_verify_SUITE.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_certificate_verify_SUITE.erl b/lib/ssl/test/ssl_certificate_verify_SUITE.erl index 9ace41acf8..d8f4ddffb9 100644 --- a/lib/ssl/test/ssl_certificate_verify_SUITE.erl +++ b/lib/ssl/test/ssl_certificate_verify_SUITE.erl @@ -77,7 +77,6 @@ error_handling_tests()-> no_authority_key_identifier]. init_per_suite(Config0) -> - Dog = ct:timetrap(?LONG_TIMEOUT *2), catch crypto:stop(), try crypto:start() of ok -> @@ -88,9 +87,8 @@ init_per_suite(Config0) -> ?config(priv_dir, Config0))), ct:log("Make certs ~p~n", [Result]), - Config1 = ssl_test_lib:make_dsa_cert(Config0), - Config = ssl_test_lib:cert_options(Config1), - [{watchdog, Dog} | Config] + Config = ssl_test_lib:make_dsa_cert(Config0), + ssl_test_lib:cert_options(Config) catch _:_ -> {skip, "Crypto did not start"} end. @@ -111,6 +109,14 @@ init_per_group(_, Config) -> end_per_group(_GroupName, Config) -> Config. +init_per_testcase(_TestCase, Config) -> + ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]), + ct:timetrap({seconds, 5}), + Config. + +end_per_testcase(_TestCase, Config) -> + Config. + %%-------------------------------------------------------------------- %% Test Cases -------------------------------------------------------- %%-------------------------------------------------------------------- |