aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2016-07-01 15:17:46 +0200
committerIngela Anderton Andin <[email protected]>2016-07-01 15:17:46 +0200
commit30e1d890e37ffd57bfbcf043b3b982c781139418 (patch)
treeb9759cfb7f45adcdc486985a900b9a5452043ea0
parent1697cdea341e7d54e754e5f85e091c8bb68fb6c7 (diff)
parent76a5eedf33ab375fea1e834e4d5708cdf0e507f4 (diff)
downloadotp-30e1d890e37ffd57bfbcf043b3b982c781139418.tar.gz
otp-30e1d890e37ffd57bfbcf043b3b982c781139418.tar.bz2
otp-30e1d890e37ffd57bfbcf043b3b982c781139418.zip
Merge branch 'ingela/ssl/dist-stop-nodes' into maint
* ingela/ssl/dist-stop-nodes: ssl: All started test nodes must be cleaned up
-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) ->