summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2014-01-29 23:20:17 +0000
committerMatthias Radestock <matthias@rabbitmq.com>2014-01-29 23:20:17 +0000
commit0d50f68d5bf4956f1ff769080955707a5b6b056e (patch)
tree0ade08dcf59cd6f9801fdf0cd5035e50b8aa857c
parenta64528edf03a042b2ae9436b4c8508c4f5b0ace2 (diff)
downloadrabbitmq-server-git-0d50f68d5bf4956f1ff769080955707a5b6b056e.tar.gz
proper cleanup
this should ensure that all process registrations etc have disappeared by the time we return from the function.
-rw-r--r--src/rabbit_tests.erl12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index b0ef33fb2f..f4b8763b89 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1402,7 +1402,13 @@ test_mcall() ->
true = lists:sort(Replies) == lists:sort(GoodResults),
true = lists:sort(Errors) == lists:sort(BadResults),
- exit(P1, bang),
+ %% cleanup
+ P1 ! stop,
+ MRef1 = erlang:monitor(process, P1),
+ receive
+ {'DOWN', MRef1, _, _, _} -> ok
+ end,
+
passed.
gs2_test_crasher() ->
@@ -1415,8 +1421,8 @@ gs2_test_listener() ->
{'$gen_call', From, hello} ->
gen_server2:reply(From, goodbye),
gs2_test_listener();
- Other ->
- exit(Other)
+ stop ->
+ ok
end.
test_statistics_event_receiver(Pid) ->