diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-09-12 15:49:46 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-09-12 15:49:46 +0200 |
| commit | 9553491d25f37ab2f555e60c9f74965299963971 (patch) | |
| tree | 1af6966682dae25d7fbf73b5da089c9c34e57e4a /lib/ssl/test/ssl_pem_cache_SUITE.erl | |
| parent | 5ee6a8af63c9d450e5cc6e9cfa9d5890adbde092 (diff) | |
| parent | 76c93beeb89ecbcf1070190c95532e0d00d06278 (diff) | |
| download | otp-9553491d25f37ab2f555e60c9f74965299963971.tar.gz otp-9553491d25f37ab2f555e60c9f74965299963971.tar.bz2 otp-9553491d25f37ab2f555e60c9f74965299963971.zip | |
Merge branch 'ingela/ssl/clean-env' into maint
* ingela/ssl/clean-env:
ssl: Make sure tests get a clean start
Diffstat (limited to 'lib/ssl/test/ssl_pem_cache_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_pem_cache_SUITE.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_pem_cache_SUITE.erl b/lib/ssl/test/ssl_pem_cache_SUITE.erl index 13b0ce8ed9..02c98fc40f 100644 --- a/lib/ssl/test/ssl_pem_cache_SUITE.erl +++ b/lib/ssl/test/ssl_pem_cache_SUITE.erl @@ -43,7 +43,7 @@ init_per_suite(Config0) -> catch crypto:stop(), try crypto:start() of ok -> - ssl:start(), + ssl_test_lib:clean_start(), %% make rsa certs using oppenssl {ok, _} = make_certs:all(proplists:get_value(data_dir, Config0), proplists:get_value(priv_dir, Config0)), @@ -63,14 +63,15 @@ end_per_group(_GroupName, Config) -> Config. init_per_testcase(pem_cleanup = Case, Config) -> - end_per_testcase(Case, Config) , application:load(ssl), + end_per_testcase(Case, Config) , application:set_env(ssl, ssl_pem_cache_clean, ?CLEANUP_INTERVAL), ssl:start(), ct:timetrap({minutes, 1}), Config. end_per_testcase(_TestCase, Config) -> + ssl_test_lib:clean_env(), ssl:stop(), Config. |