From 1df38b2a16d604d6e850f3c95bb41744da3d19bd Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Fri, 21 Jan 2011 19:03:00 +0100 Subject: Update init_per_testcase to kill all slaves when called. This is to prevent testcases which fail to before to chain with the ones run after. --- lib/kernel/test/global_SUITE.erl | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/kernel') diff --git a/lib/kernel/test/global_SUITE.erl b/lib/kernel/test/global_SUITE.erl index 8540897d5b..3cd47927c9 100644 --- a/lib/kernel/test/global_SUITE.erl +++ b/lib/kernel/test/global_SUITE.erl @@ -122,9 +122,16 @@ end_per_suite(_Config) -> init_per_testcase(Case, Config) when is_atom(Case), is_list(Config) -> ok = gen_server:call(global_name_server, high_level_trace_start,infinity), + + %% Make sure that everything is dead and done. Otherwise there are problems + %% on platforms on which it takes a long time to shut down a node. + stop_nodes(nodes()), + timer:sleep(1000), + [{?TESTCASE, Case}, {registered, registered()} | Config]. end_per_testcase(_Case, Config) -> + ct:log("Calling end_per_testcase!",[]), ?line write_high_level_trace(Config), ?line _ = gen_server:call(global_name_server, high_level_trace_stop, infinity), @@ -136,6 +143,7 @@ end_per_testcase(_Case, Config) -> {What, N} <- [{"Added", Registered -- InitRegistered}, {"Removed", InitRegistered -- Registered}], N =/= []], + ok. %%% General comments: -- cgit v1.2.3