diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-02-14 09:45:42 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-02-14 09:45:42 +0100 |
| commit | dd60ebfa1f2f6dc203deee59f95305291d06a619 (patch) | |
| tree | e02359127904757c4a56c63bc1df0292bf21e6f1 /lib/ssl/test/ssl_test_lib.erl | |
| parent | 6282023d28588e4838f37ea45a060ec48ef5ba3f (diff) | |
| parent | abef8aed9e0c016840a3193a65f1b5212a659da2 (diff) | |
| download | otp-dd60ebfa1f2f6dc203deee59f95305291d06a619.tar.gz otp-dd60ebfa1f2f6dc203deee59f95305291d06a619.tar.bz2 otp-dd60ebfa1f2f6dc203deee59f95305291d06a619.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 9632103696..49d2b5c1b8 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -278,8 +278,11 @@ check_result(Server, ServerMsg, Client, ClientMsg) -> check_result(Server, ServerMsg); {Port, {data,Debug}} when is_port(Port) -> - ct:log("~p:~p~nopenssl ~s~n",[?MODULE,?LINE, Debug]), + ct:log("~p:~p~n Openssl ~s~n",[?MODULE,?LINE, Debug]), check_result(Server, ServerMsg, Client, ClientMsg); + {Port,closed} when is_port(Port) -> + ct:log("~p:~p~n Openssl port ~n",[?MODULE,?LINE]), + check_result(Server, ServerMsg, Client, ClientMsg); Unexpected -> Reason = {{expected, {Client, ClientMsg}}, {expected, {Server, ServerMsg}}, {got, Unexpected}}, @@ -291,11 +294,11 @@ check_result(Pid, Msg) -> {Pid, Msg} -> ok; {Port, {data,Debug}} when is_port(Port) -> - ct:log("~p:~p~nopenssl ~s~n",[?MODULE,?LINE, Debug]), + ct:log("~p:~p~n Openssl ~s~n",[?MODULE,?LINE, Debug]), check_result(Pid,Msg); - %% {Port, {exit_status, Status}} when is_port(Port) -> - %% ct:log("~p:~p Exit status: ~p~n",[?MODULE,?LINE, Status]), - %% check_result(Pid, Msg); + {Port,closed} when is_port(Port)-> + ct:log("~p:~p Openssl port closed ~n",[?MODULE,?LINE]), + check_result(Pid, Msg); Unexpected -> Reason = {{expected, {Pid, Msg}}, {got, Unexpected}}, |