quorum_queue_SUITE

Author: dumbbell

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -3600,7 +3600,12 @@ format(Config) ->
     %% tests rabbit_quorum_queue:format/2
     Nodes = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
 
-    Server = hd(Nodes),
+    Server = case Nodes of
+                 [N] ->
+                     N;
+                 [_, N | _] ->
+                     N
+             end,
 
     Ch = rabbit_ct_client_helpers:open_channel(Config, Server),
     Q = ?config(queue_name, Config),
@@ -3619,7 +3624,9 @@ format(Config) ->
                                        ?FUNCTION_NAME, [QRecord, #{}]),
 
     %% test all up case
-    ?assertEqual(<<"quorum">>, proplists:get_value(type, Fmt)),
+    ?assertMatch(
+       T when T =:= <<"quorum">> orelse T =:= quorum,
+       proplists:get_value(type, Fmt)),
     ?assertEqual(running, proplists:get_value(state, Fmt)),
     ?assertEqual(Server, proplists:get_value(leader, Fmt)),
     ?assertEqual(Server, proplists:get_value(node, Fmt)),
@@ -3628,15 +3635,17 @@ format(Config) ->
 
     case length(Nodes) of
         3 ->
-            [_, Server2, Server3] = Nodes,
-            ok = rabbit_control_helper:command(stop_app, Server2),
+            [Server1, _Server2, Server3] = Nodes,
+            ok = rabbit_control_helper:command(stop_app, Server1),
             ok = rabbit_control_helper:command(stop_app, Server3),
 
             Fmt2 = rabbit_ct_broker_helpers:rpc(Config, Server, rabbit_quorum_queue,
                                                ?FUNCTION_NAME, [QRecord, #{}]),
-            ok = rabbit_control_helper:command(start_app, Server2),
+            ok = rabbit_control_helper:command(start_app, Server1),
             ok = rabbit_control_helper:command(start_app, Server3),
-            ?assertEqual(<<"quorum">>, proplists:get_value(type, Fmt2)),
+            ?assertMatch(
+               T when T =:= <<"quorum">> orelse T =:= quorum,
+               proplists:get_value(type, Fmt2)),
             ?assertEqual(minority, proplists:get_value(state, Fmt2)),
             ?assertEqual(Server, proplists:get_value(leader, Fmt2)),
             ?assertEqual(Server, proplists:get_value(node, Fmt2)),