Update tests: quorum_queue_SUITE and rabbit_db_queue_SUITE

Author: Ayanda-D

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -4159,7 +4159,7 @@ leader_health_check(Config) ->
             [<<".*">>, VHost1])),
     ?assertEqual([],
         rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
-            [<<".*">>, global])),
+            [<<".*">>, across_all_vhosts])),
 
     Conn1 = rabbit_ct_client_helpers:open_unmanaged_connection(Config, 0, VHost1),
     {ok, Ch1} = amqp_connection:open_channel(Conn1),
@@ -4180,7 +4180,7 @@ leader_health_check(Config) ->
                  declare(Ch2, Q, [{<<"x-queue-type">>, longstr, <<"quorum">>}]))
         || Q <- Qs2],
 
-    %% test sucessful health checks in vhost1, vhost2, global
+    %% test sucessful health checks in vhost1, vhost2, across_all_vhosts
     ?assertEqual([], rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
                                       [<<".*">>, VHost1])),
     ?assertEqual([], rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
@@ -4196,9 +4196,9 @@ leader_health_check(Config) ->
                                       [Q, VHost2])) || Q <- Qs2],
 
     ?assertEqual([], rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
-                                      [<<".*">>, global])),
+                                      [<<".*">>, across_all_vhosts])),
     ?assertEqual([], rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
-                                      [<<"Q.*">>, global])),
+                                      [<<"Q.*">>, across_all_vhosts])),
 
     %% clear leaderboard
     Qs = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_amqqueue, list, []),
@@ -4223,7 +4223,7 @@ leader_health_check(Config) ->
          end
             || {Q_ClusterName, Q_Res} <- QQ_Clusters],
 
-    %% test failed health checks in vhost1, vhost2, global
+    %% test failed health checks in vhost1, vhost2, across_all_vhosts
     ?assertEqual([Q1Data], rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
                                       [<<"Q.1">>, VHost1])),
     ?assertEqual([Q2Data], rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
@@ -4252,10 +4252,10 @@ leader_health_check(Config) ->
 
     ?assertEqual(QQ_Data,
         lists:usort(rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
-                        [<<"Q.*">>, global]))),
+                        [<<"Q.*">>, across_all_vhosts]))),
     ?assertEqual(QQ_Data,
         lists:usort(rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue, leader_health_check,
-                        [<<"Q.*">>, global]))),
+                        [<<"Q.*">>, across_all_vhosts]))),
 
     %% cleanup
     [?assertMatch(#'queue.delete_ok'{},

deps/rabbit/test/rabbit_db_queue_SUITE.erl

@@ -35,6 +35,7 @@ all_tests() ->
      get_all,
      get_all_by_vhost,
      get_all_by_type,
+     get_all_by_type_and_vhost,
      get_all_by_type_and_node,
      list,
      count,
@@ -198,6 +199,30 @@ get_all_by_type1(_Config) ->
     ?assertEqual([Q4], rabbit_db_queue:get_all_by_type(rabbit_stream_queue)),
     passed.
 
+get_all_by_type_and_vhost(Config) ->
+    passed = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, get_all_by_type_and_vhost1, [Config]).
+
+get_all_by_type_and_vhost1(_Config) ->
+    VHost1 = <<"carrots">>,
+    VHost2 = <<"cabage">>,
+    QName = rabbit_misc:r(VHost1, queue, <<"test-queue">>),
+    QName2 = rabbit_misc:r(VHost2, queue, <<"test-queue2">>),
+    QName3 = rabbit_misc:r(VHost2, queue, <<"test-queue3">>),
+    QName4 = rabbit_misc:r(VHost1, queue, <<"test-queue4">>),
+    Q = new_queue(QName, rabbit_classic_queue),
+    Q2 = new_queue(QName2, rabbit_quorum_queue),
+    Q3 = new_queue(QName3, rabbit_quorum_queue),
+    Q4 = new_queue(QName4, rabbit_stream_queue),
+    Quorum = lists:sort([Q2, Q3]),
+    ?assertEqual([], rabbit_db_queue:get_all_by_type_and_vhost(rabbit_classic_queue, VHost1)),
+    ?assertEqual([], lists:sort(rabbit_db_queue:get_all_by_type_and_vhost(rabbit_quorum_queue, VHost2))),
+    ?assertEqual([], rabbit_db_queue:get_all_by_type_and_vhost(rabbit_stream_queue, VHost1)),
+    set_list([Q, Q2, Q3, Q4]),
+    ?assertEqual([Q], rabbit_db_queue:get_all_by_type_and_vhost(rabbit_classic_queue, VHost1)),
+    ?assertEqual(Quorum, lists:sort(rabbit_db_queue:get_all_by_type_and_vhost(rabbit_quorum_queue, VHost2))),
+    ?assertEqual([Q4], rabbit_db_queue:get_all_by_type_and_vhost(rabbit_stream_queue, VHost1)),
+    passed.
+
 get_all_by_type_and_node(Config) ->
     passed = rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, get_all_by_type_and_node1, [Config]).