aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test/ssl_npn_handshake_SUITE.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-09-06 08:13:06 +0200
committerIngela Anderton Andin <[email protected]>2017-09-06 08:13:06 +0200
commit7394b41b9f254c7f83d508cfc615bd1d63a84507 (patch)
tree0960e4103a361337c7d0eedf29bfd93c224f89a1 /lib/ssl/test/ssl_npn_handshake_SUITE.erl
parent24dc0a81787336f54259a1212564785c93749eae (diff)
parentb3ca5727169deaa38917edca8288dcaff9a36800 (diff)
downloadotp-7394b41b9f254c7f83d508cfc615bd1d63a84507.tar.gz
otp-7394b41b9f254c7f83d508cfc615bd1d63a84507.tar.bz2
otp-7394b41b9f254c7f83d508cfc615bd1d63a84507.zip
Merge branch 'ingela/ssl/clean-tests' into maint
* ingela/ssl/clean-tests: ssl: Make sure test initilization is clean
Diffstat (limited to 'lib/ssl/test/ssl_npn_handshake_SUITE.erl')
-rw-r--r--lib/ssl/test/ssl_npn_handshake_SUITE.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssl/test/ssl_npn_handshake_SUITE.erl b/lib/ssl/test/ssl_npn_handshake_SUITE.erl
index a02881f1ae..6bf2aa2786 100644
--- a/lib/ssl/test/ssl_npn_handshake_SUITE.erl
+++ b/lib/ssl/test/ssl_npn_handshake_SUITE.erl
@@ -95,8 +95,13 @@ init_per_group(GroupName, Config) ->
Config
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(_TestCase, Config) ->
ssl_test_lib:ct_log_supported_protocol_versions(Config),