aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-07-01 15:18:28 +0200
committerIngela Anderton Andin <[email protected]>2016-07-01 15:18:28 +0200
commitf1691991f0617f7bc0d2b58a4f0ad9410c2e8442 (patch)
treec1fa3f44a47f1f4bcf2484a889cc225493db17fe /lib
parent6144aaf2c49f87ed6b1c93ce6fb56a8ef39d5f1b (diff)
parent30e1d890e37ffd57bfbcf043b3b982c781139418 (diff)
downloadotp-f1691991f0617f7bc0d2b58a4f0ad9410c2e8442.tar.gz
otp-f1691991f0617f7bc0d2b58a4f0ad9410c2e8442.tar.bz2
otp-f1691991f0617f7bc0d2b58a4f0ad9410c2e8442.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/test/ssl_dist_SUITE.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/ssl/test/ssl_dist_SUITE.erl b/lib/ssl/test/ssl_dist_SUITE.erl
index 55aa2eda2d..8740e8c8f0 100644
--- a/lib/ssl/test/ssl_dist_SUITE.erl
+++ b/lib/ssl/test/ssl_dist_SUITE.erl
@@ -680,13 +680,15 @@ stop_ssl_node(#node_handle{connection_handler = Handler,
receive
{'DOWN', Mon, process, Handler, Reason} ->
case Reason of
- normal -> ok;
- _ -> exit(Reason)
+ normal ->
+ ok;
+ _ ->
+ ct:pal("Down ~p ~n", [Reason])
end
end;
Error ->
erlang:demonitor(Mon, [flush]),
- exit(Error)
+ ct:pal("Warning ~p ~n", [Error])
end.
start_ssl_node(Config) ->