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_test_lib.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_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index a92b978ca9..81f16030f7 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1355,3 +1355,19 @@ ct_log_supported_protocol_versions(Config) -> _ -> ct:log("TLS/SSL version ~p~n ", [tls_record:supported_protocol_versions()]) end. + +clean_env() -> + application:unset_env(ssl, protocol_version), + application:unset_env(ssl, session_lifetime), + application:unset_env(ssl, session_cb), + application:unset_env(ssl, session_cb_init_args), + application:unset_env(ssl, session_cache_client_max), + application:unset_env(ssl, session_cache_server_max), + application:unset_env(ssl, ssl_pem_cache_clean), + application:unset_env(ssl, alert_timeout). + +clean_start() -> + ssl:stop(), + application:load(ssl), + clean_env(), + ssl:start(). |