aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2019-06-12 09:51:22 +0200
committerErlang/OTP <[email protected]>2019-06-12 09:51:22 +0200
commit3f2bd7ffb2fed616983d43454b5aa2f5c9a9f49a (patch)
treeab9b699367de210abe097c90ec79d5a0bbb4fd16
parentaa5a674421f5485bfd479ae4445ce66959dc1b75 (diff)
parentbe14a5043ab343a30b881d4697fd4bcd3abdb7a6 (diff)
downloadotp-3f2bd7ffb2fed616983d43454b5aa2f5c9a9f49a.tar.gz
otp-3f2bd7ffb2fed616983d43454b5aa2f5c9a9f49a.tar.bz2
otp-3f2bd7ffb2fed616983d43454b5aa2f5c9a9f49a.zip
Merge branch 'peterdmv/ssl/dtls-test-fix' into maint-22
* peterdmv/ssl/dtls-test-fix: ssl: Fix ssl_packet_SUITE
-rw-r--r--lib/ssl/test/ssl_test_lib.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 6294ce3739..832f8494c6 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -2168,7 +2168,8 @@ clean_env() ->
application:unset_env(ssl, session_cache_server_max),
application:unset_env(ssl, ssl_pem_cache_clean),
application:unset_env(ssl, bypass_pem_cache),
- application:unset_env(ssl, alert_timeout).
+ application:unset_env(ssl, alert_timeout),
+ application:unset_env(ssl, internal_active_n).
clean_start() ->
ssl:stop(),