aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-15 10:24:34 +0100
committerIngela Anderton Andin <[email protected]>2018-01-15 10:24:34 +0100
commit6770fa479205c7eb468cb854ae087859b6603bcd (patch)
tree26d6cbbb18f3345155cf1ece76402b3f2ab5d7d0
parent0cf2016b0030e56b90dbe4bc2c830387f38f7b45 (diff)
parentc32bccee999976f2a56e0d34f3f88d6c6febc0e1 (diff)
downloadotp-6770fa479205c7eb468cb854ae087859b6603bcd.tar.gz
otp-6770fa479205c7eb468cb854ae087859b6603bcd.tar.bz2
otp-6770fa479205c7eb468cb854ae087859b6603bcd.zip
Merge branch 'ingela/ssl/test-cuddle' into maint
* ingela/ssl/test-cuddle: ssl: Call clean version function
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 9258fa011b..179d1562cd 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -280,8 +280,11 @@ end_per_suite(_Config) ->
init_per_group(GroupName, Config) when GroupName == basic_tls;
GroupName == options_tls;
+ GroupName == options;
GroupName == basic;
- GroupName == options ->
+ GroupName == session;
+ GroupName == error_handling_tests_tls
+ ->
ssl_test_lib:clean_tls_version(Config);
init_per_group(GroupName, Config) ->
case ssl_test_lib:is_tls_version(GroupName) andalso ssl_test_lib:sufficient_crypto_support(GroupName) of