Fix rebase

Author: dumbbell

deps/rabbit/test/policy_SUITE.erl

@@ -362,19 +362,30 @@ is_supported_operator_policy_ha(Config) ->
     declare(Ch, QuorumQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}]),
     declare(Ch, StreamQ, [{<<"x-queue-type">>, longstr, <<"stream">>}]),
 
-    rabbit_ct_broker_helpers:set_operator_policy(
-      Config, 0, <<"operator-policy">>, <<".*">>, <<"all">>,
-      [{<<"ha-mode">>, <<"exactly">>},
-       {<<"ha-params">>, 2},
-       {<<"ha-sync-mode">>, <<"automatic">>}]),
-
-    ?awaitMatch(<<"exactly">>, check_policy_value(Server, ClassicQ, <<"ha-mode">>), 30_000),
-    ?awaitMatch(2, check_policy_value(Server, ClassicQ, <<"ha-params">>), 30_000),
-    ?awaitMatch(<<"automatic">>, check_policy_value(Server, ClassicQ, <<"ha-sync-mode">>), 30_000),
-    ?awaitMatch(undefined, check_policy_value(Server, QuorumQ, <<"ha-mode">>), 30_000),
-    ?awaitMatch(undefined, check_policy_value(Server, StreamQ, <<"ha-mode">>), 30_000),
-
-    rabbit_ct_broker_helpers:clear_operator_policy(Config, 0, <<"operator-policy">>),
+    case ?config(metadata_store, Config) of
+        mnesia ->
+            rabbit_ct_broker_helpers:set_operator_policy(
+              Config, 0, <<"operator-policy">>, <<".*">>, <<"all">>,
+              [{<<"ha-mode">>, <<"exactly">>},
+               {<<"ha-params">>, 2},
+               {<<"ha-sync-mode">>, <<"automatic">>}]),
+
+            ?awaitMatch(<<"exactly">>, check_policy_value(Server, ClassicQ, <<"ha-mode">>), 30_000),
+            ?awaitMatch(2, check_policy_value(Server, ClassicQ, <<"ha-params">>), 30_000),
+            ?awaitMatch(<<"automatic">>, check_policy_value(Server, ClassicQ, <<"ha-sync-mode">>), 30_000),
+            ?awaitMatch(undefined, check_policy_value(Server, QuorumQ, <<"ha-mode">>), 30_000),
+            ?awaitMatch(undefined, check_policy_value(Server, StreamQ, <<"ha-mode">>), 30_000),
+
+            rabbit_ct_broker_helpers:clear_operator_policy(Config, 0, <<"operator-policy">>);
+        khepri ->
+            ?assertError(
+               {badmatch, _},
+               rabbit_ct_broker_helpers:set_operator_policy(
+                 Config, 0, <<"operator-policy">>, <<".*">>, <<"all">>,
+                 [{<<"ha-mode">>, <<"exactly">>},
+                  {<<"ha-params">>, 2},
+                  {<<"ha-sync-mode">>, <<"automatic">>}]))
+    end,
 
     delete(Ch, ClassicQ),
     delete(Ch, QuorumQ),

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -2027,7 +2027,7 @@ cleanup_data_dir(Config) ->
     %% trying to delete a queue in minority. A case clause there had gone
     %% previously unnoticed.
 
-    [Server1, Server2, _Server3] = Servers = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
+    [Server1, Server2, Server3] = Servers = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
     Ch = rabbit_ct_client_helpers:open_channel(Config, Server1),
     QQ = ?config(queue_name, Config),
     ?assertEqual({'queue.declare_ok', QQ, 0, 0},
@@ -2042,7 +2042,7 @@ cleanup_data_dir(Config) ->
     ?assert(filelib:is_dir(DataDir2)),
 
     ok = rabbit_ct_broker_helpers:stop_node(Config, Server2),
-    assert_cluster_status({Servers, Servers, [Server1]}, [Server1]),
+    assert_cluster_status({Servers, Servers, [Server1, Server3]}, [Server1]),
 
     ?assertMatch(#'queue.delete_ok'{},
                  amqp_channel:call(Ch, #'queue.delete'{queue = QQ})),