diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-06-29 10:59:38 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-06-29 10:59:38 +0200 |
| commit | 49bcc77de63c37ac6c0de5c14c57583f78610f48 (patch) | |
| tree | 67a9295ca6fecf5bedafe9f8a581c4b156b15e2d /lib/ssl | |
| parent | 4dbee101c93ed9498411a116e57919c7e17b077d (diff) | |
| parent | 65419ab0fe7e3f412b5bf635a62872f301a5d06a (diff) | |
| download | otp-49bcc77de63c37ac6c0de5c14c57583f78610f48.tar.gz otp-49bcc77de63c37ac6c0de5c14c57583f78610f48.tar.bz2 otp-49bcc77de63c37ac6c0de5c14c57583f78610f48.zip | |
Merge branch 'ingela/ssl/crl-test-cuddle' into maint
* ingela/ssl/crl-test-cuddle:
ssl: Skip test if OpenSSL has problems generating CRL
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_crl_SUITE.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl index e293d183f7..668c76e38d 100644 --- a/lib/ssl/test/ssl_crl_SUITE.erl +++ b/lib/ssl/test/ssl_crl_SUITE.erl @@ -155,9 +155,15 @@ init_per_testcase(Case, Config0) -> DataDir = proplists:get_value(data_dir, Config), CertDir = filename:join(proplists:get_value(priv_dir, Config0), idp_crl), {CertOpts, Config} = init_certs(CertDir, idp_crl, Config), - {ok, _} = make_certs:all(DataDir, CertDir, CertOpts), - ct:timetrap({seconds, 6}), - [{cert_dir, CertDir} | Config]; + case make_certs:all(DataDir, CertDir, CertOpts) of + {ok, _} -> + ct:timetrap({seconds, 6}), + [{cert_dir, CertDir} | Config]; + _ -> + end_per_testcase(Case, Config0), + ssl_test_lib:clean_start(), + {skip, "Unable to create IDP crls"} + end; false -> end_per_testcase(Case, Config0), ssl_test_lib:clean_start(), |