Skip to content

Commit b44e96b

Browse files
committed
How about this?
1 parent 9b5bbce commit b44e96b

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

deps/rabbit/test/feature_flags_SUITE.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ init_per_testcase(Testcase, Config) ->
268268
Config2 = rabbit_ct_helpers:set_config(
269269
Config1,
270270
[{rmq_nodename_suffix, Testcase},
271+
{secondary_enabled_plugins, "my_plugin"},
271272
{tcp_ports_base, {skip_n_nodes,
272273
TestNumber * ClusterSize}},
273274
{net_ticktime, 5}

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,10 @@
193193
tcp_port_mqtt_tls,
194194
tcp_port_web_mqtt,
195195
tcp_port_web_mqtt_tls,
196-
tcp_port_web_mqtt_examples,
197196
tcp_port_stomp,
198197
tcp_port_stomp_tls,
199198
tcp_port_web_stomp,
200199
tcp_port_web_stomp_tls,
201-
tcp_port_web_stomp_examples,
202200
tcp_port_stream,
203201
tcp_port_stream_tls,
204202
tcp_port_prometheus
@@ -537,18 +535,10 @@ update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_mqtt = Key | Rest]) ->
537535
NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
538536
{rabbitmq_web_mqtt, [{tcp_config, [{port, ?config(Key, NodeConfig)}]}]}),
539537
update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
540-
update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_mqtt_examples = Key | Rest]) ->
541-
NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
542-
{rabbitmq_web_mqtt_examples, [{listener, [{port, ?config(Key, NodeConfig)}]}]}),
543-
update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
544538
update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp = Key | Rest]) ->
545539
NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
546540
{rabbitmq_web_stomp, [{tcp_config, [{port, ?config(Key, NodeConfig)}]}]}),
547541
update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
548-
update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp_examples = Key | Rest]) ->
549-
NodeConfig1 = rabbit_ct_helpers:merge_app_env(NodeConfig,
550-
{rabbitmq_web_stomp_examples, [{listener, [{port, ?config(Key, NodeConfig)}]}]}),
551-
update_tcp_ports_in_rmq_config(NodeConfig1, Rest);
552542
update_tcp_ports_in_rmq_config(NodeConfig, [tcp_port_web_stomp_tls | Rest]) ->
553543
%% Skip this one, because we need more than just a port to configure
554544
update_tcp_ports_in_rmq_config(NodeConfig, Rest);
@@ -779,16 +769,17 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
779769
case UseSecondaryDist of
780770
true ->
781771
SecondaryDist = ?config(secondary_dist, Config),
782-
% SecondaryEnabledPlugin = case filename:basename(SrcDir) of
783-
% "rabbit" -> "";
784-
% SrcPlugin -> SrcPlugin
785-
% end,
772+
SecondaryEnabledPlugins = case {?config(secondary_enabled_plugins, Config), filename:basename(SrcDir)} of
773+
{undefined, "rabbit"} -> "";
774+
{undefined, SrcPlugin} -> SrcPlugin;
775+
{SecondaryEnabledPlugins0, _} -> SecondaryEnabledPlugins0
776+
end,
786777
[{"DIST_DIR=~ts/plugins", [SecondaryDist]},
787778
{"CLI_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]},
788779
{"CLI_ESCRIPTS_DIR=~ts/escript", [SecondaryDist]},
789780
{"RABBITMQ_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]},
790781
{"RABBITMQ_SERVER=~ts/sbin/rabbitmq-server", [SecondaryDist]},
791-
% {"RABBITMQ_ENABLED_PLUGINS=~ts", [SecondaryEnabledPlugin]},
782+
{"RABBITMQ_ENABLED_PLUGINS=~ts", [SecondaryEnabledPlugins]},
792783
{"RABBITMQ_FEATURE_FLAGS=~ts", [?REQUIRED_FEATURE_FLAGS]}
793784
| ExtraArgs4];
794785
false ->

0 commit comments

Comments
 (0)