aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/test
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-12-06 09:01:39 +0100
committerIngela Anderton Andin <[email protected]>2016-12-06 09:01:39 +0100
commitb91e7498e625b4e6419238f753c30b509fb958d2 (patch)
tree13242c026475c2942ee3c998c8b12816f8b65646 /lib/ssl/test
parentf015c1ae35a94ca52e80ceae7a76806fe848a553 (diff)
parent1e6942e97339ff39a0436834c260bf50c3d3a481 (diff)
downloadotp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.gz
otp-b91e7498e625b4e6419238f753c30b509fb958d2.tar.bz2
otp-b91e7498e625b4e6419238f753c30b509fb958d2.zip
Merge branch 'ingela/dtls/statem/OTP-12982' into maint
* ingela/dtls/statem/OTP-12982: ssl: Implement DTLS state machine
Diffstat (limited to 'lib/ssl/test')
-rw-r--r--lib/ssl/test/ssl_basic_SUITE.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl
index 392da738ec..52c1af5b4c 100644
--- a/lib/ssl/test/ssl_basic_SUITE.erl
+++ b/lib/ssl/test/ssl_basic_SUITE.erl
@@ -52,7 +52,7 @@ all() ->
{group, options},
{group, options_tls},
{group, session},
- %%{group, 'dtlsv1.2'},
+ {group, 'dtlsv1.2'},
%%{group, 'dtlsv1'},
{group, 'tlsv1.2'},
{group, 'tlsv1.1'},
@@ -66,6 +66,7 @@ groups() ->
{options, [], options_tests()},
{options_tls, [], options_tests_tls()},
%%{'dtlsv1.2', [], all_versions_groups()},
+ {'dtlsv1.2', [], [connection_information]},
%%{'dtlsv1', [], all_versions_groups()},
{'tlsv1.2', [], all_versions_groups() ++ tls_versions_groups() ++ [conf_signature_algs, no_common_signature_algs]},
{'tlsv1.1', [], all_versions_groups() ++ tls_versions_groups()},