Resolve conflicts #11582 #11596

Author: michaelklishin

deps/rabbit/test/clustering_management_SUITE.erl

@@ -10,12 +10,7 @@
 -include_lib("common_test/include/ct.hrl").
 -include_lib("amqp_client/include/amqp_client.hrl").
 -include_lib("eunit/include/eunit.hrl").
-<<<<<<< HEAD
--include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
-
-=======
 -compile(nowarn_export_all).
->>>>>>> a277713105 (speed up limit and tracking* suites)
 -compile(export_all).
 
 -import(clustering_utils, [

deps/rabbit/test/per_vhost_connection_limit_partitions_SUITE.erl

@@ -7,11 +7,6 @@
 
 -module(per_vhost_connection_limit_partitions_SUITE).
 
-<<<<<<< HEAD
--include_lib("common_test/include/ct.hrl").
--include_lib("amqp_client/include/amqp_client.hrl").
-=======
->>>>>>> a277713105 (speed up limit and tracking* suites)
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
 

deps/rabbit/test/policy_SUITE.erl

@@ -13,23 +13,19 @@
 -include_lib("stdlib/include/assert.hrl").
 -include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl").
 
--compile(nowarn_export_all).
 -compile(export_all).
 
 all() ->
     [
-     {group, tests},
+     {group, mnesia_store},
+     {group, khepri_store},
      {group, khepri_migration}
     ].
 
 groups() ->
     [
-<<<<<<< HEAD
      {mnesia_store, [], [target_count_policy] ++ all_tests()},
      {khepri_store, [], all_tests()},
-=======
-     {tests, [], all_tests()},
->>>>>>> 087d701b6e (speed up policy_SUITE)
      {khepri_migration, [], [
                              from_mnesia_to_khepri
                             ]}
@@ -67,7 +63,11 @@ init_per_suite(Config) ->
 end_per_suite(Config) ->
     rabbit_ct_helpers:run_teardown_steps(Config).
 
-init_per_group(tests = Group, Config) ->
+init_per_group(mnesia_store = Group, Config0) ->
+    Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),
+    init_per_group_common(Group, Config, 2);
+init_per_group(khepri_store = Group, Config0) ->
+    Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, khepri}]),
     init_per_group_common(Group, Config, 2);
 init_per_group(khepri_migration = Group, Config0) ->
     Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),
@@ -583,4 +583,4 @@ verify_policy([{HA, Expect} | Tail], Server, QName) ->
     verify_policy(Tail, Server, QName).
 
 
-%%----------------------------------------------------------------------------
+%%----------------------------------------------------------------------------

deps/rabbit/test/publisher_confirms_parallel_SUITE.erl

@@ -34,18 +34,7 @@ groups() ->
                              confirm_mandatory_unroutable,
                              confirm_unroutable_message],
     [
-<<<<<<< HEAD
-     {mnesia_store, [],
-      [
-       {classic_queue, [parallel], PublisherConfirmTests ++ [confirm_nack]},
-       {mirrored_queue, [parallel], PublisherConfirmTests ++ [confirm_nack]},
-       {quorum_queue, [parallel], PublisherConfirmTests},
-       {quorum_queue, [], [confirm_minority]}
-      ]},
-     {khepri_store, [],
-=======
      {tests, [],
->>>>>>> a5819bf41e (Remove meta data store groups from publisher_confirms_parallel_SUITE)
       [
        {classic_queue, [parallel], PublisherConfirmTests ++ [confirm_nack]},
        {quorum_queue, [parallel], PublisherConfirmTests}
@@ -78,19 +67,7 @@ init_per_group(quorum_queue, Config) ->
       Config,
       [{queue_args, [{<<"x-queue-type">>, longstr, <<"quorum">>}]},
        {queue_durable, true}]);
-<<<<<<< HEAD
-init_per_group(mirrored_queue, Config) ->
-    rabbit_ct_broker_helpers:set_ha_policy(Config, 0, <<"^max_length.*queue">>,
-        <<"all">>, [{<<"ha-sync-mode">>, <<"automatic">>}]),
-    Config1 = rabbit_ct_helpers:set_config(
-                Config, [{is_mirrored, true},
-                         {queue_args, [{<<"x-queue-type">>, longstr, <<"classic">>}]},
-                         {queue_durable, true}]),
-    rabbit_ct_helpers:run_steps(Config1, []);
-init_per_group(mnesia_store = Group, Config0) ->
-=======
 init_per_group(Group, Config0) ->
->>>>>>> a5819bf41e (Remove meta data store groups from publisher_confirms_parallel_SUITE)
     Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),
     init_per_group0(Group, Config).