Skip to content

Commit c9e2993

Browse files
michaelklishinmergify-bot
authored andcommitted
Erlang 25 compat: drop a duplicate flaky test
The test largely does what it's pattern-based version does. During our Erlang 24 and 25 upgrade cycles, this version required extra attention even though the feature works as advertised in other tests and during manual testing. (cherry picked from commit b18cd3e)
1 parent 7674cbb commit c9e2993

File tree

2 files changed

+2
-14
lines changed

2 files changed

+2
-14
lines changed

deps/rabbitmq_federation/test/exchange_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ end_per_testcase(Testcase, Config) ->
197197
rabbit_ct_helpers:testcase_finished(Config, Testcase).
198198

199199
%% -------------------------------------------------------------------
200-
%% Testcases.
200+
%% Test cases
201201
%% -------------------------------------------------------------------
202202

203203
simple(Config) ->

deps/rabbitmq_federation/test/queue_SUITE.erl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
-import(rabbit_federation_test_util,
1717
[wait_for_federation/2, expect/3, expect/4,
18-
set_upstream/4, set_upstream/5, clear_upstream/3, clear_upstream_set/3,
18+
set_upstream/4, set_upstream/5, clear_upstream/3, set_upstream_set/4, clear_upstream_set/3,
1919
set_policy/5, clear_policy/3,
2020
set_policy_pattern/5, set_policy_upstream/5, q/2, with_ch/3,
2121
maybe_declare_queue/3, delete_queue/2,
@@ -33,7 +33,6 @@ all() ->
3333

3434
groups() ->
3535
ClusterSize1 = [simple,
36-
multiple_upstreams,
3736
multiple_upstreams_pattern,
3837
multiple_downstreams,
3938
message_flow,
@@ -188,17 +187,6 @@ simple(Config) ->
188187
expect_federation(Ch, <<"upstream">>, <<"fed.downstream">>)
189188
end, upstream_downstream(Config)).
190189

191-
multiple_upstreams(Config) ->
192-
SourceArgs = ?config(source_queue_args, Config),
193-
TargetArgs = ?config(target_queue_args, Config),
194-
with_ch(Config,
195-
fun (Ch) ->
196-
expect_federation(Ch, <<"upstream">>, <<"fed12.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
197-
expect_federation(Ch, <<"upstream2">>, <<"fed12.downstream">>, ?EXPECT_FEDERATION_TIMEOUT)
198-
end, [q(<<"upstream">>, SourceArgs),
199-
q(<<"upstream2">>, SourceArgs),
200-
q(<<"fed12.downstream">>, TargetArgs)]).
201-
202190
multiple_upstreams_pattern(Config) ->
203191
set_upstream(Config, 0, <<"local453x">>,
204192
rabbit_ct_broker_helpers:node_uri(Config, 0), [

0 commit comments

Comments
 (0)