root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

exchange_SUITE: Throw an exception if wait_for_federation() times out 

While here, increase two timers in the `binding_recovery` testcase.
Hopefully this will help in Concourse.
This commit is contained in:
Jean-Sébastien Pédron 2020-03-26 17:32:42 +01:00
parent c278947717
commit 2e8cdd5ba6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deps/rabbitmq_federation/test/exchange_SUITE.erl vendored
View File

@ -430,7 +430,7 @@ binding_recovery(Config) ->
amqp_channel:call(Ch, #'queue.declare'{queue = Q, amqp_channel:call(Ch, #'queue.declare'{queue = Q,
durable = true}), durable = true}),
bind_queue(Ch, Q, <<"fed.downstream">>, <<"key">>), bind_queue(Ch, Q, <<"fed.downstream">>, <<"key">>),
timer:sleep(100), %% To get the suffix written timer:sleep(1000), %% To get the suffix written
%% i.e. don't clean up %% i.e. don't clean up
rabbit_ct_client_helpers:close_channels_and_connection(Config, Rabbit), rabbit_ct_client_helpers:close_channels_and_connection(Config, Rabbit),
@ -446,7 +446,7 @@ binding_recovery(Config) ->
rabbit_ct_broker_helpers:set_parameter(Config, rabbit_ct_broker_helpers:set_parameter(Config,
Rabbit, <<"federation-upstream-set">>, <<"upstream">>, Rabbit, <<"federation-upstream-set">>, <<"upstream">>,
[[{<<"upstream">>, <<"rabbit">>}, {<<"exchange">>, <<"upstream">>}]]), [[{<<"upstream">>, <<"rabbit">>}, {<<"exchange">>, <<"upstream">>}]]),
wait_for_federation(120, Config, Rabbit, <<"/">>), wait_for_federation(360, Config, Rabbit, <<"/">>),
publish_expect(Ch3, <<"upstream">>, <<"key">>, Q, <<"HELLO">>), publish_expect(Ch3, <<"upstream">>, <<"key">>, Q, <<"HELLO">>),
true = (none =/= suffix(Config, Rabbit, <<"rabbit">>, "upstream")), true = (none =/= suffix(Config, Rabbit, <<"rabbit">>, "upstream")),
@ -939,8 +939,8 @@ dynamic_policy_cleanup(Config) ->
assert_connections(Config, 0, [X1], []) assert_connections(Config, 0, [X1], [])
end, [x(X1)]). end, [x(X1)]).
wait_for_federation(0, _, _, _) -> wait_for_federation(0, _, Node, VHost) ->
ok; throw({timeout_while_waiting_for_federation, Node, VHost});
wait_for_federation(N, Config, Node, VHost) -> wait_for_federation(N, Config, Node, VHost) ->
case has_internal_federated_exchange(Config, Node, VHost) andalso case has_internal_federated_exchange(Config, Node, VHost) andalso
has_internal_federated_queue(Config, Node, VHost) of has_internal_federated_queue(Config, Node, VHost) of