Federated queue suite: make it easier to identify messages

(cherry picked from commit 7b57750)
(cherry picked from commit 455937a)
(cherry picked from commit e13743e)

Author: michaelklishin

deps/rabbitmq_federation/test/queue_SUITE.erl

@@ -203,8 +203,8 @@ multiple_upstreams(Config) ->
     TargetArgs = ?config(target_queue_args, Config),
     with_ch(Config,
       fun (Ch) ->
-              expect_federation(Ch, <<"upstream">>, <<"fed12.downstream">>),
-              expect_federation(Ch, <<"upstream2">>, <<"fed12.downstream">>)
+              expect_federation(Ch, <<"upstream">>, <<"fed12.downstream">>, ?EXPECT_FEDERATION_TIMEOUT),
+              expect_federation(Ch, <<"upstream2">>, <<"fed12.downstream">>, ?EXPECT_FEDERATION_TIMEOUT)
       end, [q(<<"upstream">>, SourceArgs),
             q(<<"upstream2">>, SourceArgs),
             q(<<"fed12.downstream">>, TargetArgs)]).
@@ -418,10 +418,14 @@ expect_empty(Ch, Q) ->
     rabbit_federation_test_util:expect_empty(Ch, Q).
 
 expect_federation(Ch, UpstreamQ, DownstreamQ) ->
-    publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, <<"HELLO">>).
+    Base = <<"HELLO">>,
+    Payload = <<Base/binary, "-to-", UpstreamQ/binary>>,
+    publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, Payload).
 
 expect_federation(Ch, UpstreamQ, DownstreamQ, Timeout) ->
-    publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, <<"HELLO">>, Timeout).
+    Base = <<"HELLO">>,
+    Payload = <<Base/binary, "-to-", UpstreamQ/binary>>,
+    publish_expect(Ch, <<>>, UpstreamQ, DownstreamQ, Payload, Timeout).
 
 expect_no_federation(Ch, UpstreamQ, DownstreamQ) ->
     publish(Ch, <<>>, UpstreamQ, <<"HELLO">>),