diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-10-02 10:47:19 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-10-02 10:47:19 +0200 |
| commit | b05a53e38ec670b0d7cfe3b350d4f3858c36acd0 (patch) | |
| tree | 3b9cb6546dccd0c48531afaae3d55cc1df88de4a /lib/ssl/test | |
| parent | d8fc2c8c1b0424ee42b1ddc8aef63056bc9e85fb (diff) | |
| parent | 52dda64b51b30a90a093d3e928e3e75d817e9cc6 (diff) | |
| download | otp-b05a53e38ec670b0d7cfe3b350d4f3858c36acd0.tar.gz otp-b05a53e38ec670b0d7cfe3b350d4f3858c36acd0.tar.bz2 otp-b05a53e38ec670b0d7cfe3b350d4f3858c36acd0.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test')
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 3 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 9efde4752f..3b4ca40058 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -83,13 +83,14 @@ groups() -> ]. tls_versions_groups ()-> - [{group, renegotiate}, %% Should be in all_versions_groups not fixed for DTLS yet + [ {group, api_tls}, {group, tls_ciphers}, {group, error_handling_tests_tls}]. all_versions_groups ()-> [{group, api}, + {group, renegotiate}, {group, ciphers}, {group, ciphers_ec}, {group, error_handling_tests}]. diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 2e1a0b94ea..9118e4b7e3 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -90,9 +90,9 @@ dtls_all_versions_tests() -> erlang_client_openssl_server_dsa_cert, erlang_server_openssl_client_dsa_cert, erlang_server_openssl_client_reuse_session, - %%erlang_client_openssl_server_renegotiate, - %%erlang_client_openssl_server_nowrap_seqnum, - %%erlang_server_openssl_client_nowrap_seqnum, + erlang_client_openssl_server_renegotiate, + erlang_client_openssl_server_nowrap_seqnum, + erlang_server_openssl_client_nowrap_seqnum, erlang_client_openssl_server_no_server_ca_cert, erlang_client_openssl_server_client_cert, erlang_server_openssl_client_client_cert, |