Skip to content

Commit 01df671

Browse files
Merge pull request #4370 from rabbitmq/mergify/bp/v3.8.x/pr-4369
Federated queue suite: make it easier to identify messages (backport #4366) (backport #4367) (backport #4369)
2 parents fd3a88f + a562745 commit 01df671

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

deps/rabbitmq_federation/test/queue_SUITE.erl

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ multiple_upstreams(Config) ->
203203
TargetArgs = ?config(target_queue_args, Config),
204204
with_ch(Config,
205205
fun (Ch) ->
206-
expect_federation(Ch, <<"upstream">>, <<"fed12.downstream">>),
207-
expect_federation(Ch, <<"upstream2">>, <<"fed12.downstream">>)
206+
expect_federation(Ch, <<"upstream">>, <<"fed12.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
207+
expect_federation(Ch, <<"upstream2">>, <<"fed12.downstream">>, ?EXPECT_FEDERATION_TIMEOUT)
208208
end, [q(<<"upstream">>, SourceArgs),
209209
q(<<"upstream2">>, SourceArgs),
210210
q(<<"fed12.downstream">>, TargetArgs)]).
@@ -418,10 +418,14 @@ expect_empty(Ch, Q) ->
418418
rabbit_federation_test_util:expect_empty(Ch, Q).
419419

420420
expect_federation(Ch, UpstreamQ, DownstreamQ) ->
421-
publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, <<"HELLO">>).
421+
Base = <<"HELLO">>,
422+
Payload = <<Base/binary, "-to-", UpstreamQ/binary>>,
423+
publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, Payload).
422424

423425
expect_federation(Ch, UpstreamQ, DownstreamQ, Timeout) ->
424-
publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, <<"HELLO">>, Timeout).
426+
Base = <<"HELLO">>,
427+
Payload = <<Base/binary, "-to-", UpstreamQ/binary>>,
428+
publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, Payload, Timeout).
425429

426430
expect_no_federation(Ch, UpstreamQ, DownstreamQ) ->
427431
publish(Ch, <<>>, UpstreamQ, <<"HELLO">>),

0 commit comments

Comments
 (0)