@@ -94,12 +94,17 @@ groups() ->
9494 single_active_consumer_priority_take_over ,
9595 single_active_consumer_priority ,
9696 force_shrink_member_to_current_member ,
97+ <<<<<<< HEAD
9798<<<<<<< HEAD
9899 force_all_queues_shrink_member_to_current_member ,
99100 force_vhost_queues_shrink_member_to_current_member
100101=======
101102 force_all_queues_shrink_member_to_current_member
102103>>>>>>> 10 dbde1f71 (QQ tests for force - shrink to current member operations )
104+ =======
105+ force_all_queues_shrink_member_to_current_member ,
106+ force_vhost_queues_shrink_member_to_current_member
107+ >>>>>>> c9d97e61de (Add test for QQ force_vhost_queues_shrink_member_to_current_member / 1 )
103108 ]
104109 ++ all_tests ()},
105110 {cluster_size_5 , [], [start_queue ,
@@ -1241,6 +1246,9 @@ force_all_queues_shrink_member_to_current_member(Config) ->
12411246 end || Q <- QQs ].
12421247
12431248<<<<<<< HEAD
1249+ <<<<<<< HEAD
1250+ =======
1251+ >>>>>>> c9d97e61de (Add test for QQ force_vhost_queues_shrink_member_to_current_member / 1 )
12441252force_vhost_queues_shrink_member_to_current_member (Config ) ->
12451253 [Server0 , Server1 , Server2 ] =
12461254 rabbit_ct_broker_helpers :get_node_configs (Config , nodename ),
@@ -1307,8 +1315,11 @@ force_vhost_queues_shrink_member_to_current_member(Config) ->
13071315 ? assertEqual (3 , length (Nodes0 ))
13081316 end || Q <- QQs , VHost <- VHosts ].
13091317
1318+ <<<<<<< HEAD
13101319=======
13111320>>>>>>> 10 dbde1f71 (QQ tests for force - shrink to current member operations )
1321+ =======
1322+ >>>>>>> c9d97e61de (Add test for QQ force_vhost_queues_shrink_member_to_current_member / 1 )
13121323priority_queue_fifo (Config ) ->
13131324 % % testing: if hi priority messages are published before lo priority
13141325 % % messages they are always consumed first (fifo)
0 commit comments