diff options
author | Kenneth Lundin <[email protected]> | 2011-03-08 17:26:32 +0100 |
---|---|---|
committer | Kenneth Lundin <[email protected]> | 2011-03-08 17:26:32 +0100 |
commit | 00eac4ea859ea5cade4942dc8219355d7bca6149 (patch) | |
tree | 6504c7b5cb148ee9e7defc6fa677271c9f8c10e1 /lib/ssl/test/ssl_test_lib.erl | |
parent | 26d701c1c334d41a43712b71c11d61995cecd279 (diff) | |
parent | dea83e25a671b0bc2661582c3227c1728d69bfea (diff) | |
download | otp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.gz otp-00eac4ea859ea5cade4942dc8219355d7bca6149.tar.bz2 otp-00eac4ea859ea5cade4942dc8219355d7bca6149.zip |
Merge branch 'dev' of super:otp into dev
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
-rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index f6ccbe85e3..8c639aa312 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -128,12 +128,14 @@ remove_close_msg(ReconnectTimes) -> remove_close_msg(ReconnectTimes -1) end. - start_client(Args) -> - Result = spawn_link(?MODULE, run_client, [Args]), + Result = spawn_link(?MODULE, run_client, [lists:delete(return_socket, Args)]), receive - connected -> - Result + { connected, Socket } -> + case lists:member(return_socket, Args) of + true -> { Result, Socket }; + false -> Result + end end. run_client(Opts) -> @@ -145,7 +147,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, + Pid ! { connected, Socket }, test_server:format("Client: connected~n", []), %% In specail cases we want to know the client port, it will %% be indicated by sending {port, 0} in options list! |