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_basic_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_basic_SUITE.erl')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 8ffee751fc..57963fd44b 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -250,7 +250,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)), @@ -307,6 +307,7 @@ init_per_testcase(protocol_versions, Config) -> init_per_testcase(reuse_session_expired, Config) -> ssl:stop(), application:load(ssl), + ssl_test_lib:clean_env(), application:set_env(ssl, session_lifetime, ?EXPIRE), application:set_env(ssl, session_delay_cleanup_time, 500), ssl:start(), @@ -316,6 +317,7 @@ init_per_testcase(reuse_session_expired, Config) -> init_per_testcase(empty_protocol_versions, Config) -> ssl:stop(), application:load(ssl), + ssl_test_lib:clean_env(), application:set_env(ssl, protocol_version, []), ssl:start(), ct:timetrap({seconds, 5}), @@ -454,6 +456,11 @@ end_per_testcase(reuse_session_expired, Config) -> application:unset_env(ssl, session_delay_cleanup_time), end_per_testcase(default_action, Config); +end_per_testcase(Case, Config) when Case == protocol_versions; + Case == empty_protocol_versions-> + application:unset_env(ssl, protocol_versions), + end_per_testcase(default_action, Config); + end_per_testcase(_TestCase, Config) -> Config. |