summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Wragg <dpw@lshift.net>2010-02-15 14:53:25 +0000
committerDavid Wragg <dpw@lshift.net>2010-02-15 14:53:25 +0000
commit4447e956dc40082269b6083f9d21acfeaf068141 (patch)
treea08f61a3e018746c0073e564cd2ab64ebf7f736d
parent259e0eafcea3da14d89e21d9cb5205e3fc29fedb (diff)
parent7d7021d18c546d4086ae7bf21d43f450b7346802 (diff)
downloadrabbitmq-server-4447e956dc40082269b6083f9d21acfeaf068141.tar.gz
Merge bug22363 into default
-rw-r--r--src/rabbit_tests.erl9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 277e6717..51d95c35 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -31,6 +31,8 @@
-module(rabbit_tests).
+-compile([export_all]).
+
-export([all_tests/0, test_parsing/0]).
%% Exported so the hook mechanism can call back
@@ -187,7 +189,7 @@ test_simple_n_element_queue(N) ->
test_pg_local() ->
[P, Q] = [spawn(fun () -> receive X -> X end end) || _ <- [x, x]],
check_pg_local(ok, [], []),
- check_pg_local(pg_local:join(a, P), [P], []),
+ check_pg_local(pg_local:join(a, P), [P], []),
check_pg_local(pg_local:join(b, P), [P], [P]),
check_pg_local(pg_local:join(a, P), [P, P], [P]),
check_pg_local(pg_local:join(a, Q), [P, P, Q], [P]),
@@ -197,7 +199,10 @@ test_pg_local() ->
check_pg_local(pg_local:leave(b, P), [P, Q], [Q, Q]),
check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]),
check_pg_local(pg_local:leave(a, P), [Q], [Q, Q]),
- [X ! done || X <- [P, Q]],
+ [begin X ! done,
+ Ref = erlang:monitor(process, X),
+ receive {'DOWN', Ref, process, X, _Info} -> ok end
+ end || X <- [P, Q]],
check_pg_local(ok, [], []),
passed.