diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-04-13 14:00:59 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-13 14:00:59 +0000 |
| commit | e8b92d40b92142d1654994f16855922b8060a484 (patch) | |
| tree | a7fdce2a9c564646d8c309c3e6683f27a92e9bfd /lib/ssl/test/ssl_test_lib.erl | |
| parent | 3137955104f78ab1c42a00e9309d1b39577f506f (diff) | |
| download | otp-e8b92d40b92142d1654994f16855922b8060a484.tar.gz otp-e8b92d40b92142d1654994f16855922b8060a484.tar.bz2 otp-e8b92d40b92142d1654994f16855922b8060a484.zip | |
OTP-8554 Certificate extensions
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 466e987e3e..63a9bb8d87 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -129,7 +129,11 @@ remove_close_msg(ReconnectTimes) -> start_client(Args) -> - spawn_link(?MODULE, run_client, [Args]). + Result = spawn_link(?MODULE, run_client, [Args]), + receive + connected -> + Result + end. run_client(Opts) -> Node = proplists:get_value(node, Opts), @@ -140,6 +144,7 @@ run_client(Opts) -> test_server:format("ssl:connect(~p, ~p, ~p)~n", [Host, Port, Options]), case rpc:call(Node, ssl, connect, [Host, Port, Options]) of {ok, Socket} -> + Pid ! connected, test_server:format("Client: connected~n", []), case proplists:get_value(port, Options) of 0 -> @@ -271,7 +276,7 @@ cert_options(Config) -> "badcert.pem"]), BadKeyFile = filename:join([?config(priv_dir, Config), "badkey.pem"]), - [{client_opts, [{ssl_imp, new}]}, + [{client_opts, [{ssl_imp, new},{reuseaddr, true}]}, {client_verification_opts, [{cacertfile, ClientCaCertFile}, {certfile, ClientCertFile}, {keyfile, ClientKeyFile}, @@ -370,7 +375,7 @@ run_upgrade_client(Opts) -> test_server:format("gen_tcp:connect(~p, ~p, ~p)~n", [Host, Port, TcpOptions]), {ok, Socket} = rpc:call(Node, gen_tcp, connect, [Host, Port, TcpOptions]), - + case proplists:get_value(port, Opts) of 0 -> {ok, {_, NewPort}} = inet:sockname(Socket), |