aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_ECC_SUITE.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-09-06 09:58:41 +0200
committerLukas Larsson <[email protected]>2017-09-06 09:58:41 +0200
commit5785903d249026b7698ae48bb6e154f5e2a36c9b (patch)
treebbe40b9f292e170672c7b22d7e91d57de56d8295 /lib/ssl/test/ssl_ECC_SUITE.erl
parentd36893e369f77e401fba6a9aed527f530037648b (diff)
parent7394b41b9f254c7f83d508cfc615bd1d63a84507 (diff)
downloadotp-5785903d249026b7698ae48bb6e154f5e2a36c9b.tar.gz
otp-5785903d249026b7698ae48bb6e154f5e2a36c9b.tar.bz2
otp-5785903d249026b7698ae48bb6e154f5e2a36c9b.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_ECC_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_ECC_SUITE.erl10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_ECC_SUITE.erl b/lib/ssl/test/ssl_ECC_SUITE.erl
index c48ccfb83b..64e8042b25 100644
--- a/lib/ssl/test/ssl_ECC_SUITE.erl
+++ b/lib/ssl/test/ssl_ECC_SUITE.erl
@@ -200,8 +200,14 @@ common_init_per_group(GroupName, Config) ->
openssl_check(GroupName, Config)
end.
-end_per_group(_GroupName, Config) ->
- proplists:delete(tls_version, Config).
+end_per_group(GroupName, Config0) ->
+ case ssl_test_lib:is_tls_version(GroupName) of
+ true ->
+ Config = ssl_test_lib:clean_tls_version(Config0),
+ proplists:delete(tls_version, Config);
+ false ->
+ Config0
+ end.
%%--------------------------------------------------------------------