diff options
| -rw-r--r-- | src/rabbit_tests.erl | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 76ebd982f4..720c865b25 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -857,10 +857,11 @@ test_delegates_async(SecondaryNode) -> passed. -make_responder(FMsg) -> +make_responder(FMsg) -> make_responder(FMsg, timeout). +make_responder(FMsg, Throw) -> fun() -> receive Msg -> FMsg(Msg) - after 1000 -> throw(timeout) + after 1000 -> throw(Throw) end end. @@ -894,17 +895,21 @@ test_delegates_sync(SecondaryNode) -> gen_server:reply(From, response) end), + BadResponder = make_responder(fun({'$gen_call', From, invoked}) -> + gen_server:reply(From, response) + end, bad_responder_died), + response = delegate:invoke(spawn(Responder), Sender), response = delegate:invoke(spawn(SecondaryNode, Responder), Sender), - must_exit(fun() -> delegate:invoke(spawn(Responder), BadSender) end), + must_exit(fun() -> delegate:invoke(spawn(BadResponder), BadSender) end), must_exit(fun() -> - delegate:invoke(spawn(SecondaryNode, Responder), BadSender) end), + delegate:invoke(spawn(SecondaryNode, BadResponder), BadSender) end), LocalGoodPids = spawn_responders(node(), Responder, 2), RemoteGoodPids = spawn_responders(SecondaryNode, Responder, 2), - LocalBadPids = spawn_responders(node(), Responder, 2), - RemoteBadPids = spawn_responders(SecondaryNode, Responder, 2), + LocalBadPids = spawn_responders(node(), BadResponder, 2), + RemoteBadPids = spawn_responders(SecondaryNode, BadResponder, 2), {GoodRes, []} = delegate:invoke(LocalGoodPids ++ RemoteGoodPids, Sender), true = lists:all(fun ({_, response}) -> true end, GoodRes), |