diff options
| -rw-r--r-- | lib/ssl/test/ssl_basic_SUITE.erl | 10 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 29 |
2 files changed, 20 insertions, 19 deletions
diff --git a/lib/ssl/test/ssl_basic_SUITE.erl b/lib/ssl/test/ssl_basic_SUITE.erl index 7e3d178957..bff6d254f1 100644 --- a/lib/ssl/test/ssl_basic_SUITE.erl +++ b/lib/ssl/test/ssl_basic_SUITE.erl @@ -149,10 +149,8 @@ options_tests_tls() -> api_tests() -> [connection_info, connection_information, - peername, peercert, peercert_with_client_cert, - sockname, versions, eccs, controlling_process, @@ -177,6 +175,8 @@ api_tests_tls() -> tls_shutdown_write, tls_shutdown_both, tls_shutdown_error, + peername, + sockname, new_options_in_accept ]. @@ -230,15 +230,15 @@ cipher_tests_ec() -> ciphers_ecdh_rsa_signed_certs_openssl_names]. error_handling_tests()-> - [controller_dies, - close_transport_accept, + [close_transport_accept, recv_active, recv_active_once, recv_error_handling ]. error_handling_tests_tls()-> - [tls_client_closes_socket, + [controller_dies, + tls_client_closes_socket, tls_tcp_error_propagation_in_active_mode, tls_tcp_connect, tls_tcp_connect_big, diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index de56aa133a..7a1dce70c2 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -85,21 +85,22 @@ all_versions_tests() -> ]. dtls_all_versions_tests() -> [ - %erlang_client_openssl_server, + %%erlang_client_openssl_server, erlang_server_openssl_client, - %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_no_server_ca_cert, - %erlang_client_openssl_server_client_cert, - %erlang_server_openssl_client_client_cert - %ciphers_rsa_signed_certs, - %ciphers_dsa_signed_certs, - %erlang_client_bad_openssl_server, - %expired_session + %%erlang_client_openssl_server_dsa_cert, + erlang_server_openssl_client_dsa_cert + %% This one works but gets port EXIT first some times + %%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_no_server_ca_cert, + %%erlang_client_openssl_server_client_cert, + %%erlang_server_openssl_client_client_cert + %%ciphers_rsa_signed_certs, + %%ciphers_dsa_signed_certs, + %%erlang_client_bad_openssl_server, + %%expired_session ]. alpn_tests() -> |