aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2019-08-21 10:19:27 +0200
committerIngela Anderton Andin <[email protected]>2019-08-21 10:19:27 +0200
commitefe616ac2a43f0b45fbb909d28b48616ba5637ac (patch)
tree17da32756d95bf34ef24102c2f3db95219dbbf5d /lib/ssl
parentec82235231c66d3de392507d684bd4c5263de07e (diff)
parent5451bb1dd5a831704c9ec2d7eda940c4c3496d43 (diff)
downloadotp-efe616ac2a43f0b45fbb909d28b48616ba5637ac.tar.gz
otp-efe616ac2a43f0b45fbb909d28b48616ba5637ac.tar.bz2
otp-efe616ac2a43f0b45fbb909d28b48616ba5637ac.zip
Merge branch 'ingela/ssl/test-cuddle' into maint
* ingela/ssl/test-cuddle: public_key: Use another time in test certificates ssl: Robustify test case
Diffstat (limited to 'lib/ssl')
-rw-r--r--lib/ssl/test/openssl_session_SUITE.erl1
-rw-r--r--lib/ssl/test/ssl_test_lib.erl5
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssl/test/openssl_session_SUITE.erl b/lib/ssl/test/openssl_session_SUITE.erl
index 97d83b98c3..7c129633da 100644
--- a/lib/ssl/test/openssl_session_SUITE.erl
+++ b/lib/ssl/test/openssl_session_SUITE.erl
@@ -149,6 +149,7 @@ reuse_session_erlang_server() ->
[{doc, "Test erlang server with openssl client that reconnects with the"
"same session id, to test reusing of sessions."}].
reuse_session_erlang_server(Config) when is_list(Config) ->
+ process_flag(trap_exit, true),
ServerOpts = ssl_test_lib:ssl_options(server_rsa_opts, Config),
{_, ServerNode, Hostname} = ssl_test_lib:run_where(Config),
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl
index 5dd5fc45af..c4f294771a 100644
--- a/lib/ssl/test/ssl_test_lib.erl
+++ b/lib/ssl/test/ssl_test_lib.erl
@@ -493,7 +493,10 @@ check_result(Server, ServerMsg, Client, ClientMsg) ->
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]),
+ ct:log("~p:~p~n Openssl port closed ~n",[?MODULE,?LINE]),
+ check_result(Server, ServerMsg, Client, ClientMsg);
+ {'EXIT', epipe} ->
+ ct:log("~p:~p~n Openssl port died ~n",[?MODULE,?LINE]),
check_result(Server, ServerMsg, Client, ClientMsg);
Unexpected ->
Reason = {{expected, {Client, ClientMsg}},