summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-08-19 14:18:04 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-08-19 14:18:04 +0100
commitdc32d1fd4bdf67a3c4982e82545f0bd6ab56e299 (patch)
treeebd237ac3911473b9d70e98d54ef87195782c09a
parent2c3616f54fe083e5ad9ac6bf4e6267005f880eae (diff)
parent0ba936f4051a437866bd1d0bcb3d2e806c42cf48 (diff)
downloadrabbitmq-server-git-dc32d1fd4bdf67a3c4982e82545f0bd6ab56e299.tar.gz
merge bug24354 into default (test_refresh_events/1 sometimes fails)
-rw-r--r--src/rabbit_tests.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index bbca55b433..cd5d9be0cc 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1471,7 +1471,11 @@ expect_events(Pid, Type) ->
expect_event(Pid, Type).
expect_event(Pid, Type) ->
- receive #event{type = Type, props = Props} -> Pid = pget(pid, Props)
+ receive #event{type = Type, props = Props} ->
+ case pget(pid, Props) of
+ Pid -> ok;
+ _ -> expect_event(Pid, Type)
+ end
after 1000 -> throw({failed_to_receive_event, Type})
end.