aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2018-01-15 10:25:12 +0100
committerIngela Anderton Andin <[email protected]>2018-01-15 10:25:12 +0100
commit030070142f4128213ac1052319d19ad1926996b3 (patch)
treec1a117076e19a48051cc0d5be83d222b1ce4126b
parent98bbc9fa814fd854a1474116642184a3575a515d (diff)
parent6770fa479205c7eb468cb854ae087859b6603bcd (diff)
downloadotp-030070142f4128213ac1052319d19ad1926996b3.tar.gz
otp-030070142f4128213ac1052319d19ad1926996b3.tar.bz2
otp-030070142f4128213ac1052319d19ad1926996b3.zip
Merge branch 'maint'
* maint: 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