Adapt #16293 to the v4.3.x branch with non-native STOMP

References #16294.

(cherry picked from commit 6323a5d)

Author: michaelklishin

deps/rabbitmq_stomp/test/connections_SUITE.erl

@@ -91,11 +91,7 @@ direct_client_connections_are_not_leaked(Config) ->
                            Client, "LOL", [{"", ""}])
                   end,
                   lists:seq(1, 100)),
-<<<<<<< HEAD
     ?awaitMatch(N, count_connections(Config), 30_000),
-=======
-    rabbit_ct_helpers:await_condition(fun() -> count_connections(Config) =:= N end, 30_000),
->>>>>>> f364a7fce (Fix more test flakes (QQs, MQTT, STOMP, Stream Protocol))
     ok.
 
 messages_not_dropped_on_disconnect(Config) ->

deps/rabbitmq_stomp/test/system_SUITE.erl

@@ -118,70 +118,6 @@ end_per_testcase0(publish_unauthorized_error, Config) ->
 end_per_testcase0(_, Config) ->
     Config.
 
-<<<<<<< HEAD
-=======
-transaction_limit(Config) ->
-    Client = ?config(stomp_client, Config),
-    %% Open 16 transactions (the limit)
-    lists:foreach(fun(I) ->
-        TxId = integer_to_binary(I),
-        rabbit_stomp_client:send(Client, 'BEGIN',
-            [{<<"transaction">>, TxId}])
-    end, lists:seq(1, 16)),
-
-    %% The 17th should fail
-    rabbit_stomp_client:send(Client, 'BEGIN',
-        [{<<"transaction">>, <<"17">>}]),
-    {ok, _Client1, Hdrs, _} = stomp_receive(Client, 'ERROR'),
-    <<"Transaction limit exceeded">> = maps:get(<<"message">>, Hdrs),
-    ok.
-
-global_counters(Config) ->
-    Version = ?config(version, Config),
-    ProtoVer = stomp_proto_ver(Version),
-    Dest = iolist_to_binary(["/topic/counter-test-", Version]),
-
-    C0 = get_global_counters(Config, ProtoVer),
-    Pubs0 = maps:get(publishers, C0, 0),
-    Cons0 = maps:get(consumers, C0, 0),
-    Recv0 = maps:get(messages_received_total, C0, 0),
-    Routed0 = maps:get(messages_routed_total, C0, 0),
-
-    Client = ?config(stomp_client, Config),
-    rabbit_stomp_client:send(
-      Client, 'SUBSCRIBE',
-      [{<<"destination">>, Dest}, {<<"id">>, <<"counter-sub">>}]),
-
-    rabbit_stomp_client:send(
-      Client, 'SEND', [{<<"destination">>, Dest}], ["hello"]),
-
-    {ok, Client1, _Hdrs, _Body} = stomp_receive(Client, 'MESSAGE'),
-
-    C1 = get_global_counters(Config, ProtoVer),
-    ?assertEqual(Pubs0 + 1, maps:get(publishers, C1)),
-    ?assertEqual(Cons0 + 1, maps:get(consumers, C1)),
-    ?assertEqual(Recv0 + 1, maps:get(messages_received_total, C1)),
-    ?assertEqual(Routed0 + 1, maps:get(messages_routed_total, C1)),
-
-    rabbit_stomp_client:send(
-      Client1, 'UNSUBSCRIBE', [{<<"id">>, <<"counter-sub">>}]),
-
-    rabbit_ct_helpers:await_condition(
-      fun() -> maps:get(consumers, get_global_counters(Config, ProtoVer)) =:= Cons0 end,
-      5_000),
-
-    ok.
-
-get_global_counters(Config, ProtoVer) ->
-    maps:get(#{protocol => ProtoVer},
-             rabbit_ct_broker_helpers:rpc(
-               Config, 0, rabbit_global_counters, overview, [])).
-
-stomp_proto_ver("1.0") -> 'STOMP 1.0';
-stomp_proto_ver("1.1") -> 'STOMP 1.1';
-stomp_proto_ver("1.2") -> 'STOMP 1.2'.
-
->>>>>>> f364a7fce (Fix more test flakes (QQs, MQTT, STOMP, Stream Protocol))
 publish_no_dest_error(Config) ->
     Client = ?config(stomp_client, Config),
     rabbit_stomp_client:send(