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.

Author: michaelklishin

deps/rabbitmq_federation/test/exchange_SUITE.erl

@@ -197,7 +197,7 @@ end_per_testcase(Testcase, Config) ->
     rabbit_ct_helpers:testcase_finished(Config, Testcase).
 
 %% -------------------------------------------------------------------
-%% Testcases.
+%% Test cases
 %% -------------------------------------------------------------------
 
 simple(Config) ->

deps/rabbitmq_federation/test/queue_SUITE.erl

@@ -15,7 +15,7 @@
 
 -import(rabbit_federation_test_util,
         [wait_for_federation/2, expect/3, expect/4,
-         set_upstream/4, set_upstream/5, clear_upstream/3, clear_upstream_set/3,
+         set_upstream/4, set_upstream/5, clear_upstream/3, set_upstream_set/4, clear_upstream_set/3,
          set_policy/5, clear_policy/3,
          set_policy_pattern/5, set_policy_upstream/5, q/2, with_ch/3,
          maybe_declare_queue/3, delete_queue/2,
@@ -33,7 +33,6 @@ all() ->
 
 groups() ->
     ClusterSize1 = [simple,
-                    multiple_upstreams,
                     multiple_upstreams_pattern,
                     multiple_downstreams,
                     message_flow,
@@ -188,17 +187,6 @@ simple(Config) ->
               expect_federation(Ch, <<"upstream">>, <<"fed.downstream">>)
       end, upstream_downstream(Config)).
 
-multiple_upstreams(Config) ->
-    SourceArgs = ?config(source_queue_args, Config),
-    TargetArgs = ?config(target_queue_args, Config),
-    with_ch(Config,
-      fun (Ch) ->
-              expect_federation(Ch, <<"upstream">>, <<"fed12.downstream">>),
-              expect_federation(Ch, <<"upstream2">>, <<"fed12.downstream">>)
-      end, [q(<<"upstream">>, SourceArgs),
-            q(<<"upstream2">>, SourceArgs),
-            q(<<"fed12.downstream">>, TargetArgs)]).
-
 multiple_upstreams_pattern(Config) ->
     set_upstream(Config, 0, <<"local453x">>,
         rabbit_ct_broker_helpers:node_uri(Config, 0), [
@@ -408,10 +396,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">>),