diff options
| author | kjnilsson <knilsson@pivotal.io> | 2019-05-01 14:00:51 +0100 |
|---|---|---|
| committer | kjnilsson <knilsson@pivotal.io> | 2019-05-01 14:11:05 +0100 |
| commit | 9933cc44876cd5b277a0ecf3c7a2e31f636384c7 (patch) | |
| tree | c1b78c4298d4c9bdb1699b0f9d9126717550143e /test | |
| parent | 45402b9454a12f6b1a9be3ff1827ed4ee74da7d1 (diff) | |
| download | rabbitmq-server-git-9933cc44876cd5b277a0ecf3c7a2e31f636384c7.tar.gz | |
Always close channel on consumer timeout
In order to keep things simple and consistent this changes consumer
timeouts to always close the channel instead of cancelling and
returning.
Diffstat (limited to 'test')
| -rw-r--r-- | test/consumer_timeout_SUITE.erl | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/test/consumer_timeout_SUITE.erl b/test/consumer_timeout_SUITE.erl index 8817b93c03..b1b55879cc 100644 --- a/test/consumer_timeout_SUITE.erl +++ b/test/consumer_timeout_SUITE.erl @@ -129,26 +129,26 @@ end_per_testcase(Testcase, Config) -> rabbit_ct_helpers:testcase_finished(Config, Testcase). consumer_timeout(Config) -> - {_, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, 0), + {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, 0), QName = ?config(queue_name, Config), declare_queue(Ch, Config, QName), publish(Ch, QName, [<<"msg1">>]), wait_for_messages(Config, [[QName, <<"1">>, <<"1">>, <<"0">>]]), subscribe(Ch, QName, false), + erlang:monitor(process, Conn), + erlang:monitor(process, Ch), receive - {#'basic.deliver'{delivery_tag = _, - redelivered = false}, _} -> - %% do nothing with the delivery should trigger timeout - receive - #'basic.cancel'{ } -> - wait_for_messages(Config, [[QName, <<"1">>, <<"1">>, <<"0">>]]), - ok - after 20000 -> - flush(1), - exit(cancel_never_happened) - end - after 5000 -> - exit(deliver_timeout) + {'DOWN', _, process, Ch, _} -> ok + after 30000 -> + flush(1), + exit(channel_exit_expected) + end, + receive + {'DOWN', _, process, Conn, _} -> + flush(1), + exit(unexpected_connection_exit) + after 2000 -> + ok end, rabbit_ct_client_helpers:close_channel(Ch), ok. |