diff options
author | Lukas Larsson <[email protected]> | 2017-09-06 09:58:41 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2017-09-06 09:58:41 +0200 |
commit | 5785903d249026b7698ae48bb6e154f5e2a36c9b (patch) | |
tree | bbe40b9f292e170672c7b22d7e91d57de56d8295 /lib/ssl/test/ssl_basic_SUITE.erl | |
parent | d36893e369f77e401fba6a9aed527f530037648b (diff) | |
parent | 7394b41b9f254c7f83d508cfc615bd1d63a84507 (diff) | |
download | otp-5785903d249026b7698ae48bb6e154f5e2a36c9b.tar.gz otp-5785903d249026b7698ae48bb6e154f5e2a36c9b.tar.bz2 otp-5785903d249026b7698ae48bb6e154f5e2a36c9b.zip |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_basic_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index e4faf267b7..2bbb03a854 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -276,13 +276,6 @@ end_per_suite(_Config) -> application:stop(crypto). %%-------------------------------------------------------------------- -init_per_group(GroupName, Config) when GroupName == basic; - GroupName == basic_tls; - GroupName == options; - GroupName == options_tls; - GroupName == session -> - ssl_test_lib:init_tls_version_default(Config); - init_per_group(GroupName, Config) -> case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of true -> @@ -297,8 +290,13 @@ init_per_group(GroupName, Config) -> end end. -end_per_group(_GroupName, Config) -> - Config. +end_per_group(GroupName, Config) -> + case ssl_test_lib:is_tls_version(GroupName) of + true -> + ssl_test_lib:clean_tls_version(Config); + false -> + Config + end. %%-------------------------------------------------------------------- init_per_testcase(Case, Config) when Case == unordered_protocol_versions_client; |