From 287ab39e946b4578d755038989ad50ccfb95f575 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Wed, 17 Jun 2015 16:47:06 +0200 Subject: ssl: modernize timetrap handling Watchdog is legacy test_server use only ct:timetrap/1 --- lib/ssl/test/ssl_alpn_handshake_SUITE.erl | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/ssl/test/ssl_alpn_handshake_SUITE.erl') diff --git a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl b/lib/ssl/test/ssl_alpn_handshake_SUITE.erl index ee79a9d641..b944afa9df 100644 --- a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_alpn_handshake_SUITE.erl @@ -104,6 +104,14 @@ init_per_group(GroupName, 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, 10}), + Config. + +end_per_testcase(_TestCase, Config) -> + Config. + %%-------------------------------------------------------------------- %% Test Cases -------------------------------------------------------- %%-------------------------------------------------------------------- -- cgit v1.2.3 From 566cbee917638f596c5d46bd0aff331a66f5c8d2 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 22 Jun 2015 16:47:42 +0200 Subject: ssl: Make init functions fail if make_certs:all fails --- lib/ssl/test/ssl_alpn_handshake_SUITE.erl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lib/ssl/test/ssl_alpn_handshake_SUITE.erl') diff --git a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl b/lib/ssl/test/ssl_alpn_handshake_SUITE.erl index b944afa9df..379604ac8a 100644 --- a/lib/ssl/test/ssl_alpn_handshake_SUITE.erl +++ b/lib/ssl/test/ssl_alpn_handshake_SUITE.erl @@ -71,10 +71,8 @@ init_per_suite(Config) -> try crypto:start() of ok -> ssl:start(), - Result = - (catch make_certs:all(?config(data_dir, Config), - ?config(priv_dir, Config))), - ct:log("Make certs ~p~n", [Result]), + {ok, _} = make_certs:all(?config(data_dir, Config), + ?config(priv_dir, Config)), ssl_test_lib:cert_options(Config) catch _:_ -> {skip, "Crypto did not start"} -- cgit v1.2.3