diff options
author | Ingela Anderton Andin <[email protected]> | 2019-07-26 14:46:16 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2019-07-26 14:46:16 +0200 |
commit | 7ac38b4a99e74f2bc6c8843bf11eece318010738 (patch) | |
tree | 4017b449abcf84fe49b167c72e1ea7219c868e4c /lib/ssl/test/ssl_api_SUITE.erl | |
parent | 22b71cc0264a1db0dd813893b883d34b7e5ee88e (diff) | |
parent | 393301feebfa2fe7839250541df25944c4d04697 (diff) | |
download | otp-7ac38b4a99e74f2bc6c8843bf11eece318010738.tar.gz otp-7ac38b4a99e74f2bc6c8843bf11eece318010738.tar.bz2 otp-7ac38b4a99e74f2bc6c8843bf11eece318010738.zip |
Merge branch 'ingela/ssl/test-enhancment' into maint
* ingela/ssl/test-enhancment:
ssl: Move reuseaddr test to tls_api_SUITE
ssl: Avoid devision with zero in ssl_bench_SUITE
Diffstat (limited to 'lib/ssl/test/ssl_api_SUITE.erl')
-rw-r--r-- | lib/ssl/test/ssl_api_SUITE.erl | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/lib/ssl/test/ssl_api_SUITE.erl b/lib/ssl/test/ssl_api_SUITE.erl index 128832c23c..74e18122a6 100644 --- a/lib/ssl/test/ssl_api_SUITE.erl +++ b/lib/ssl/test/ssl_api_SUITE.erl @@ -97,7 +97,6 @@ gen_api_tests() -> honor_client_cipher_order, ipv6, der_input, - reuseaddr, new_options_in_handshake, max_handshake_size, invalid_certfile, @@ -1362,45 +1361,6 @@ invalid_cacertfile(Config) when is_list(Config) -> ok. %%-------------------------------------------------------------------- -reuseaddr() -> - [{doc,"Test reuseaddr option"}]. - -reuseaddr(Config) when is_list(Config) -> - ClientOpts = ssl_test_lib:ssl_options(client_rsa_opts, Config), - ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config), - {ClientNode, ServerNode, Hostname} = ssl_test_lib:run_where(Config), - Server = - ssl_test_lib:start_server([{node, ServerNode}, {port, 0}, - {from, self()}, - {mfa, {ssl_test_lib, no_result, []}}, - {options, [{active, false}, {reuseaddr, true}| ServerOpts]}]), - Port = ssl_test_lib:inet_port(Server), - Client = - ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, - {host, Hostname}, - {from, self()}, - {mfa, {ssl_test_lib, no_result, []}}, - {options, [{active, false} | ClientOpts]}]), - ssl_test_lib:close(Server), - ssl_test_lib:close(Client), - - Server1 = - ssl_test_lib:start_server([{node, ServerNode}, {port, Port}, - {from, self()}, - {mfa, {ssl_test_lib, send_recv_result, []}}, - {options, [{active, false}, {reuseaddr, true} | ServerOpts]}]), - Client1 = - ssl_test_lib:start_client([{node, ClientNode}, {port, Port}, - {host, Hostname}, - {from, self()}, - {mfa, {ssl_test_lib, send_recv_result, []}}, - {options, [{active, false} | ClientOpts]}]), - - ssl_test_lib:check_result(Server1, ok, Client1, ok), - ssl_test_lib:close(Server1), - ssl_test_lib:close(Client1). - -%%-------------------------------------------------------------------- new_options_in_handshake() -> [{doc,"Test that you can set ssl options in handshake/3 and not only in tcp upgrade"}]. new_options_in_handshake(Config) when is_list(Config) -> |