@@ -732,11 +732,11 @@ disable_plugin(Config) ->
732732 Node = get_node_config (Config , 0 , nodename ),
733733 Status0 = rabbit_ct_broker_helpers :rpc (Config , Node , rabbit , status , []),
734734 Listeners0 = proplists :get_value (listeners , Status0 ),
735- ? assert (lists :keymember (http , 1 , Listeners0 )),
735+ ? assert (lists :member (http , listener_protos ( Listeners0 ) )),
736736 rabbit_ct_broker_helpers :disable_plugin (Config , Node , 'rabbitmq_web_dispatch' ),
737737 Status = rabbit_ct_broker_helpers :rpc (Config , Node , rabbit , status , []),
738738 Listeners = proplists :get_value (listeners , Status ),
739- ? assert (not lists :keymember (http , 1 , Listeners )),
739+ ? assert (not lists :member (http , listener_protos ( Listeners ) )),
740740 rabbit_ct_broker_helpers :enable_plugin (Config , Node , 'rabbitmq_management' ).
741741
742742% %----------------------------------------------------------------------------
@@ -867,3 +867,14 @@ send_to_all_collectors(Msg) ->
867867 [{rabbit_mgmt_metrics_collector :name (Table ), N } ! Msg
868868 || {Table , _ } <- ? CORE_TABLES ]
869869 end || N <- [node () | nodes ()]].
870+
871+ listener_protos (Listeners ) ->
872+ [listener_proto (L ) || L <- Listeners ].
873+
874+ listener_proto (# listener {protocol = Proto }) ->
875+ Proto ;
876+ listener_proto (Proto ) when is_atom (Proto ) ->
877+ Proto ;
878+ % % rabbit:status/0 used this formatting before rabbitmq/rabbitmq-cli#340
879+ listener_proto ({Proto , _Port , _Interface }) ->
880+ Proto .
0 commit comments