aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_crl_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-06-23 10:08:51 +0200
committerIngela Anderton Andin <[email protected]>2015-06-23 10:08:51 +0200
commit7cff27e14e051b6ee15f564335eb8e685e1639c1 (patch)
treeb97f48f3482bd7f0651acdaab4eba69709a8c88f /lib/ssl/test/ssl_crl_SUITE.erl
parentc57c5c83acb3a21b52304bc53cbdf32e0dda3690 (diff)
parent566cbee917638f596c5d46bd0aff331a66f5c8d2 (diff)
downloadotp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.gz
otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.tar.bz2
otp-7cff27e14e051b6ee15f564335eb8e685e1639c1.zip
Merge branch 'ia/ssl/modern-timetrap'
* ia/ssl/modern-timetrap: ssl: Make init functions fail if make_certs:all fails ssl: Avoid sleep ssl: modernize timetrap handling
Diffstat (limited to 'lib/ssl/test/ssl_crl_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_crl_SUITE.erl16
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl
index ae8534f779..44580be1ff 100644
--- a/lib/ssl/test/ssl_crl_SUITE.erl
+++ b/lib/ssl/test/ssl_crl_SUITE.erl
@@ -27,8 +27,6 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("public_key/include/public_key.hrl").
--define(LONG_TIMEOUT, 600000).
-
%%--------------------------------------------------------------------
%% Common Test interface functions -----------------------------------
%%--------------------------------------------------------------------
@@ -58,8 +56,7 @@ basic_tests() ->
[crl_verify_valid, crl_verify_revoked].
-init_per_suite(Config0) ->
- Dog = ct:timetrap(?LONG_TIMEOUT *2),
+init_per_suite(Config) ->
case os:find_executable("openssl") of
false ->
{skip, "Openssl not found"};
@@ -78,7 +75,7 @@ init_per_suite(Config0) ->
true -> inet6;
false -> inet
end,
- [{ipfamily,IPfamily}, {watchdog, Dog}, {openssl_version,OpenSSL_version} | Config0]
+ [{ipfamily,IPfamily}, {openssl_version,OpenSSL_version} | Config]
catch _:_ ->
{skip, "Crypto did not start"}
end
@@ -103,8 +100,8 @@ init_per_group(Group, Config0) ->
DataDir = ?config(data_dir, Config0),
CertDir = filename:join(?config(priv_dir, Config0), Group),
{CertOpts, Config} = init_certs(CertDir, Group, Config0),
- Result = make_certs:all(DataDir, CertDir, CertOpts),
- [{make_cert_result, Result}, {cert_dir, CertDir}, {idp_crl, false} | Config]
+ {ok, _} = make_certs:all(DataDir, CertDir, CertOpts),
+ [{cert_dir, CertDir}, {idp_crl, false} | Config]
end.
end_per_group(_GroupName, Config) ->
@@ -130,8 +127,9 @@ init_per_testcase(Case, Config0) ->
DataDir = ?config(data_dir, Config),
CertDir = filename:join(?config(priv_dir, Config0), idp_crl),
{CertOpts, Config} = init_certs(CertDir, idp_crl, Config),
- Result = make_certs:all(DataDir, CertDir, CertOpts),
- [{make_cert_result, Result}, {cert_dir, CertDir} | Config];
+ {ok, _} = make_certs:all(DataDir, CertDir, CertOpts),
+ ct:timetrap({seconds, 6}),
+ [{cert_dir, CertDir} | Config];
false ->
end_per_testcase(Case, Config0),
ssl:start(),