Mqtt test: Solve dependencies for web mqtt

Author: dcorbacho

deps/rabbitmq_mqtt/test/v5_SUITE.erl

@@ -142,8 +142,9 @@ suite() ->
 %% Testsuite setup/teardown.
 %% -------------------------------------------------------------------
 
-init_per_suite(Config) ->
+init_per_suite(Config0) ->
     rabbit_ct_helpers:log_environment(),
+    Config = rabbit_ct_helpers:set_config(Config0, {test_plugins, [rabbitmq_mqtt]}),
     rabbit_ct_helpers:run_setup_steps(Config).
 
 end_per_suite(Config) ->
@@ -171,7 +172,7 @@ init_per_group(Group, Config0) ->
                 Config,
                 rabbit_ct_broker_helpers:setup_steps() ++
                     rabbit_ct_client_helpers:setup_steps()),
-    util:enable_plugin(Config2, rabbitmq_mqtt),
+    [util:enable_plugin(Config2, Plugin) || Plugin <- ?config(test_plugins, Config2)],
     Config2.
 
 end_per_group(G, Config)
@@ -922,7 +923,7 @@ subscription_options_persisted(Config) ->
                                        {<<"t2">>, [{nl, false}, {rap, true}, {qos, 1}]}]),
     unlink(C1),
     ok = rabbit_ct_broker_helpers:restart_node(Config, 0),
-    util:enable_plugin(Config, rabbitmq_mqtt),
+    [util:enable_plugin(Config, Plugin) || Plugin <- ?config(test_plugins, Config)],
     C2 = connect(ClientId, Config, [{clean_start, false}]),
     ok = emqtt:publish(C2, <<"t1">>, <<"m1">>),
     ok = emqtt:publish(C2, <<"t2">>, <<"m2">>, [{retain, true}]),
@@ -1747,7 +1748,7 @@ will_delay_node_restart(Config) ->
     timer:sleep(SleepMs),
     assert_nothing_received(),
     ok = rabbit_ct_broker_helpers:start_node(Config, 0),
-    util:enable_plugin(Config, rabbitmq_mqtt),
+    [util:enable_plugin(Config, Plugin) || Plugin <- ?config(test_plugins, Config)],
     %% After node 0 restarts, we should receive the Will Message promptly on both nodes 0 and 1.
     receive {publish, #{client_pid := Sub1,
                         payload := Payload}} -> ok

deps/rabbitmq_web_mqtt/test/web_mqtt_v5_SUITE.erl

@@ -18,17 +18,19 @@ groups() ->
 suite() ->
     v5_SUITE:suite().
 
-init_per_suite(Config) ->
-    v5_SUITE:init_per_suite(Config).
+init_per_suite(Config0) ->
+    Config = v5_SUITE:init_per_suite(Config0),
+    rabbit_ct_helpers:set_config(Config, {test_plugins, [rabbitmq_mqtt,
+                                                         rabbitmq_web_mqtt]}).
 
 end_per_suite(Config) ->
     v5_SUITE:end_per_suite(Config).
 
 init_per_group(mqtt, Config) ->
     %% This is the main difference with rabbitmq_mqtt.
     rabbit_ct_helpers:set_config(Config, {websocket, true});
-init_per_group(Group, Config) ->
-    v5_SUITE:init_per_group(Group, Config).
+init_per_group(Group, Config0) ->
+    v5_SUITE:init_per_group(Group, Config0).
 
 end_per_group(Group, Config) ->
     v5_SUITE:end_per_group(Group, Config).