One more node-wide DQT test

References #11541 #11457 #11528

(cherry picked from commit c41c27d)

Author: michaelklishin

deps/rabbit/src/rabbit_queue_type.erl

@@ -300,14 +300,23 @@ short_alias_of(<<"rabbit_quorum_queue">>) ->
     <<"quorum">>;
 short_alias_of(rabbit_quorum_queue) ->
     <<"quorum">>;
+%% AMQP 1.0 management client
+short_alias_of({utf8, <<"quorum">>}) ->
+    <<"quorum">>;
 short_alias_of(<<"rabbit_classic_queue">>) ->
     <<"classic">>;
 short_alias_of(rabbit_classic_queue) ->
     <<"classic">>;
+%% AMQP 1.0 management client
+short_alias_of({utf8, <<"classic">>}) ->
+    <<"classic">>;
 short_alias_of(<<"rabbit_stream_queue">>) ->
     <<"stream">>;
 short_alias_of(rabbit_stream_queue) ->
     <<"stream">>;
+%% AMQP 1.0 management client
+short_alias_of({utf8, <<"stream">>}) ->
+    <<"stream">>;
 short_alias_of(_Other) ->
     undefined.
 

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -144,6 +144,7 @@ all_tests() ->
      server_system_recover,
      vhost_with_quorum_queue_is_deleted,
      vhost_with_default_queue_type_declares_quorum_queue,
+     node_wide_default_queue_type_declares_quorum_queue,
      delete_immediately_by_resource,
      consume_redelivery_count,
      subscribe_redelivery_count,
@@ -604,7 +605,7 @@ start_queue_concurrent(Config) ->
 quorum_cluster_size_3(Config) ->
     case rabbit_ct_helpers:is_mixed_versions() of
         true ->
-            {skip, "quorum_cluster_size_3 tests isn't mixed version reliable"};
+            {skip, "quorum_cluster_size_3 test isn't mixed version reliable"};
         false ->
             quorum_cluster_size_x(Config, 3, 3)
     end.
@@ -829,6 +830,40 @@ vhost_with_default_queue_type_declares_quorum_queue(Config) ->
     amqp_connection:close(Conn),
     ok.
 
+node_wide_default_queue_type_declares_quorum_queue(Config) ->
+    case rabbit_ct_helpers:is_mixed_versions() of
+    true ->
+        {skip, "node_wide_default_queue_type_declares_quorum_queue test isn't mixed version compatible"};
+    false ->
+        node_wide_default_queue_type_declares_quorum_queue0(Config)
+    end.
+
+node_wide_default_queue_type_declares_quorum_queue0(Config) ->
+    Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
+    rpc:call(Node, application, set_env, [rabbit, default_queue_type, rabbit_quorum_queue]),
+    VHost = atom_to_binary(?FUNCTION_NAME, utf8),
+    QName = atom_to_binary(?FUNCTION_NAME, utf8),
+    User = ?config(rmq_username, Config),
+
+    AddVhostArgs = [VHost, #{}, User],
+    ok = rabbit_ct_broker_helpers:rpc(Config, Node, rabbit_vhost, add,
+        AddVhostArgs),
+    ok = rabbit_ct_broker_helpers:set_full_permissions(Config, User, VHost),
+    Conn = rabbit_ct_client_helpers:open_unmanaged_connection(Config, Node, VHost),
+    {ok, Ch} = amqp_connection:open_channel(Conn),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0}, declare(Ch, QName, [])),
+    assert_queue_type(Node, VHost, QName, rabbit_quorum_queue),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0}, declare(Ch, QName, [])),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0},
+        declare(Ch, QName, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0}, declare_passive(Ch, QName, [])),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0},
+        declare_passive(Ch, QName, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
+    amqp_connection:close(Conn),
+
+    rpc:call(Node, application, set_env, [rabbit, default_queue_type, rabbit_classic_queue]),
+    ok.
+
 restart_all_types(Config) ->
     %% Test the node restart with both types of queues (quorum and classic) to
     %% ensure there are no regressions
@@ -1236,7 +1271,7 @@ shrink_all(Config) ->
 rebalance(Config) ->
     case rabbit_ct_helpers:is_mixed_versions() of
         true ->
-            {skip, "rebalance tests isn't mixed version compatible"};
+            {skip, "rebalance test isn't mixed version compatible"};
         false ->
             rebalance0(Config)
     end.
@@ -1704,7 +1739,7 @@ leadership_takeover(Config) ->
 metrics_cleanup_on_leadership_takeover(Config) ->
     case rabbit_ct_helpers:is_mixed_versions() of
         true ->
-            {skip, "metrics_cleanup_on_leadership_takeover tests isn't mixed version compatible"};
+            {skip, "metrics_cleanup_on_leadership_takeover test isn't mixed version compatible"};
         false ->
             metrics_cleanup_on_leadership_takeover0(Config)
     end.

deps/rabbitmq_amqp_client/test/management_SUITE.erl

@@ -117,7 +117,7 @@ init_per_testcase(Testcase, Config) ->
     rabbit_ct_helpers:testcase_started(Config, Testcase).
 
 end_per_testcase(Testcase, Config) ->
-    %% Assert that every testcase cleaned up.
+    %% Ensure that all queues were cleaned up
     eventually(?_assertEqual([], rpc(Config, rabbit_amqqueue, list, []))),
     rabbit_ct_helpers:testcase_finished(Config, Testcase).
 
@@ -268,12 +268,12 @@ all_management_operations(Config) ->
 queue_defaults(Config) ->
     Init = {_, LinkPair} = init(Config),
     QName = atom_to_binary(?FUNCTION_NAME),
+    {ok, _} = rabbitmq_amqp_client:delete_queue(LinkPair, QName),
     {ok, _} = rabbitmq_amqp_client:declare_queue(LinkPair, QName, #{}),
-    [Q] = rpc(Config, rabbit_amqqueue, list, []),
+    {ok, Q} = rpc(Config, rabbit_amqqueue, lookup, [QName, <<"/">>]),
     ?assert(rpc(Config, amqqueue, is_durable, [Q])),
     ?assertNot(rpc(Config, amqqueue, is_exclusive, [Q])),
     ?assertNot(rpc(Config, amqqueue, is_auto_delete, [Q])),
-    ?assertEqual([], rpc(Config, amqqueue, get_arguments, [Q])),
 
     {ok, _} = rabbitmq_amqp_client:delete_queue(LinkPair, QName),
     ok = cleanup(Init).
@@ -448,10 +448,11 @@ declare_queue_default_queue_type(Config) ->
     {ok, Session} = amqp10_client:begin_session_sync(Connection),
     {ok, LinkPair} = rabbitmq_amqp_client:attach_management_link_pair_sync(Session, <<"my link pair">>),
 
+    {ok, _} = rabbitmq_amqp_client:delete_queue(LinkPair, QName),
     ?assertMatch({ok, #{type := <<"quorum">>}},
                  rabbitmq_amqp_client:declare_queue(LinkPair, QName, #{})),
 
-    {ok, #{}} = rabbitmq_amqp_client:delete_queue(LinkPair, QName),
+    {ok, _} = rabbitmq_amqp_client:delete_queue(LinkPair, QName),
     ok = rabbitmq_amqp_client:detach_management_link_pair_sync(LinkPair),
     ok = amqp10_client:end_session(Session),
     ok = amqp10_client:close_connection(Connection),