Skip to content

Commit 628dce0

Browse files
dcorbachodcorbacho
committed
Update rabbitmq_cli federation test dependency
1 parent d55ebb3 commit 628dce0

9 files changed

+108
-108
lines changed

‎deps/rabbitmq_cli/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ $(LINKED_ESCRIPTS): $(ESCRIPT_FILE)
122122
tests:: escript test-deps
123123
$(verbose) $(MAKE) -C ../../ install-cli
124124
$(verbose) $(MAKE) -C ../../ start-background-broker \
125-
PLUGINS="rabbitmq_federation rabbitmq_stomp rabbitmq_stream_management amqp_client" \
125+
PLUGINS="rabbitmq_federation_common rabbitmq_stomp rabbitmq_stream_management amqp_client" \
126126
$(if $(filter khepri,$(RABBITMQ_METADATA_STORE)),,RABBITMQ_FEATURE_FLAGS="-khepri_db")
127127
$(gen_verbose) $(MIX_TEST) \
128128
$(if $(RABBITMQ_METADATA_STORE),--exclude $(filter-out $(RABBITMQ_METADATA_STORE),khepri mnesia),) \

‎deps/rabbitmq_cli/test/ctl/list_parameters_command_test.exs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ defmodule ListParametersCommandTest do
3737
rabbitmq_home: rabbitmq_home
3838
}
3939

40-
set_enabled_plugins([:rabbitmq_stomp, :rabbitmq_federation], :online, node, opts)
40+
set_enabled_plugins([:rabbitmq_stomp, :rabbitmq_federation_common], :online, node, opts)
4141

4242
add_vhost(@vhost)
4343

‎deps/rabbitmq_cli/test/plugins/disable_plugins_command_test.exs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ defmodule DisablePluginsCommandTest do
5252

5353
setup context do
5454
set_enabled_plugins(
55-
[:rabbitmq_stomp, :rabbitmq_federation],
55+
[:rabbitmq_stomp, :rabbitmq_federation_common],
5656
:online,
5757
get_rabbit_hostname(),
5858
context[:opts]
@@ -105,14 +105,14 @@ defmodule DisablePluginsCommandTest do
105105
@command.run(["rabbitmq_stomp"], Map.merge(context[:opts], %{node: :nonode}))
106106

107107
assert [
108-
[:rabbitmq_federation],
109-
%{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_federation]}
108+
[:rabbitmq_federation_common],
109+
%{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_federation_common]}
110110
] ==
111111
Enum.to_list(test_stream)
112112

113-
assert {:ok, [[:rabbitmq_federation]]} == :file.consult(context[:opts][:enabled_plugins_file])
113+
assert {:ok, [[:rabbitmq_federation_common]]} == :file.consult(context[:opts][:enabled_plugins_file])
114114

115-
assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] ==
115+
assert [:amqp_client, :rabbitmq_federation_common, :rabbitmq_stomp] ==
116116
Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, []))
117117
end
118118

@@ -125,27 +125,27 @@ defmodule DisablePluginsCommandTest do
125125
)
126126

127127
assert [
128-
[:rabbitmq_federation],
129-
%{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_federation]}
128+
[:rabbitmq_federation_common],
129+
%{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_federation_common]}
130130
] == Enum.to_list(test_stream)
131131

132-
assert {:ok, [[:rabbitmq_federation]]} == :file.consult(context[:opts][:enabled_plugins_file])
132+
assert {:ok, [[:rabbitmq_federation_common]]} == :file.consult(context[:opts][:enabled_plugins_file])
133133

134-
assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] ==
134+
assert [:amqp_client, :rabbitmq_federation_common, :rabbitmq_stomp] ==
135135
Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, []))
136136
end
137137

138138
test "in offline mode, removes implicitly enabled plugins when the last explicitly enabled one is removed",
139139
context do
140140
assert {:stream, test_stream0} =
141141
@command.run(
142-
["rabbitmq_federation"],
142+
["rabbitmq_federation_common"],
143143
Map.merge(context[:opts], %{offline: true, online: false})
144144
)
145145

146146
assert [
147147
[:rabbitmq_stomp],
148-
%{mode: :offline, disabled: [:rabbitmq_federation], set: [:rabbitmq_stomp]}
148+
%{mode: :offline, disabled: [:rabbitmq_federation_common], set: [:rabbitmq_stomp]}
149149
] == Enum.to_list(test_stream0)
150150

151151
assert {:ok, [[:rabbitmq_stomp]]} == :file.consult(context[:opts][:enabled_plugins_file])
@@ -166,31 +166,31 @@ defmodule DisablePluginsCommandTest do
166166
assert {:stream, test_stream0} = @command.run(["rabbitmq_stomp"], context[:opts])
167167

168168
assert [
169-
[:rabbitmq_federation],
169+
[:rabbitmq_federation_common],
170170
%{
171171
mode: :online,
172172
started: [],
173173
stopped: [:rabbitmq_stomp],
174174
disabled: [:rabbitmq_stomp],
175-
set: [:rabbitmq_federation]
175+
set: [:rabbitmq_federation_common]
176176
}
177177
] ==
178178
Enum.to_list(test_stream0)
179179

180-
assert {:ok, [[:rabbitmq_federation]]} == :file.consult(context[:opts][:enabled_plugins_file])
180+
assert {:ok, [[:rabbitmq_federation_common]]} == :file.consult(context[:opts][:enabled_plugins_file])
181181

182-
assert [:amqp_client, :rabbitmq_federation] ==
182+
assert [:amqp_client, :rabbitmq_federation_common] ==
183183
Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, []))
184184

185-
assert {:stream, test_stream1} = @command.run(["rabbitmq_federation"], context[:opts])
185+
assert {:stream, test_stream1} = @command.run(["rabbitmq_federation_common"], context[:opts])
186186

187187
assert [
188188
[],
189189
%{
190190
mode: :online,
191191
started: [],
192-
stopped: [:rabbitmq_federation],
193-
disabled: [:rabbitmq_federation],
192+
stopped: [:rabbitmq_federation_common],
193+
disabled: [:rabbitmq_federation_common],
194194
set: []
195195
}
196196
] ==
@@ -205,7 +205,7 @@ defmodule DisablePluginsCommandTest do
205205

206206
test "can disable multiple plugins at once", context do
207207
assert {:stream, test_stream} =
208-
@command.run(["rabbitmq_stomp", "rabbitmq_federation"], context[:opts])
208+
@command.run(["rabbitmq_stomp", "rabbitmq_federation_common"], context[:opts])
209209

210210
[[], m0] = Enum.to_list(test_stream)
211211

@@ -214,7 +214,7 @@ defmodule DisablePluginsCommandTest do
214214
|> Map.update!(:stopped, &Enum.sort/1)
215215
|> Map.update!(:disabled, &Enum.sort/1)
216216

217-
expected_list = Enum.sort([:rabbitmq_federation, :rabbitmq_stomp])
217+
expected_list = Enum.sort([:rabbitmq_federation_common, :rabbitmq_stomp])
218218

219219
assert [
220220
[],
@@ -243,7 +243,7 @@ defmodule DisablePluginsCommandTest do
243243
|> Map.update!(:stopped, &Enum.sort/1)
244244
|> Map.update!(:disabled, &Enum.sort/1)
245245

246-
expected_list = Enum.sort([:rabbitmq_federation, :rabbitmq_stomp])
246+
expected_list = Enum.sort([:rabbitmq_federation_common, :rabbitmq_stomp])
247247

248248
assert [
249249
[],

‎deps/rabbitmq_cli/test/plugins/enable_plugins_command_test.exs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ defmodule EnablePluginsCommandTest do
6666

6767
def reset_enabled_plugins_to_preconfigured_defaults(context) do
6868
set_enabled_plugins(
69-
[:rabbitmq_stomp, :rabbitmq_federation],
69+
[:rabbitmq_stomp, :rabbitmq_federation_common],
7070
:online,
7171
get_rabbit_hostname(),
7272
context[:opts]
@@ -120,7 +120,7 @@ defmodule EnablePluginsCommandTest do
120120

121121
check_plugins_enabled([:rabbitmq_stomp], context)
122122

123-
assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] ==
123+
assert [:amqp_client, :rabbitmq_federation_common, :rabbitmq_stomp] ==
124124
currently_active_plugins(context)
125125
end
126126

@@ -144,7 +144,7 @@ defmodule EnablePluginsCommandTest do
144144
check_plugins_enabled([:rabbitmq_stomp], context)
145145

146146
assert_equal_sets(
147-
[:amqp_client, :rabbitmq_federation, :rabbitmq_stomp],
147+
[:amqp_client, :rabbitmq_federation_common, :rabbitmq_stomp],
148148
currently_active_plugins(context)
149149
)
150150
end
@@ -169,21 +169,21 @@ defmodule EnablePluginsCommandTest do
169169

170170
assert {:stream, test_stream1} =
171171
@command.run(
172-
["rabbitmq_federation"],
172+
["rabbitmq_federation_common"],
173173
Map.merge(context[:opts], %{offline: true, online: false})
174174
)
175175

176176
assert [
177-
[:rabbitmq_federation, :rabbitmq_stomp],
177+
[:rabbitmq_federation_common, :rabbitmq_stomp],
178178
%{
179179
mode: :offline,
180-
enabled: [:rabbitmq_federation],
181-
set: [:rabbitmq_federation, :rabbitmq_stomp]
180+
enabled: [:rabbitmq_federation_common],
181+
set: [:rabbitmq_federation_common, :rabbitmq_stomp]
182182
}
183183
] ==
184184
Enum.to_list(test_stream1)
185185

186-
check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation], context)
186+
check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation_common], context)
187187
end
188188

189189
test "run: updates plugin list and starts newly enabled plugins", context do
@@ -207,24 +207,24 @@ defmodule EnablePluginsCommandTest do
207207
check_plugins_enabled([:rabbitmq_stomp], context)
208208
assert_equal_sets([:amqp_client, :rabbitmq_stomp], currently_active_plugins(context))
209209

210-
{:stream, test_stream1} = @command.run(["rabbitmq_federation"], context[:opts])
210+
{:stream, test_stream1} = @command.run(["rabbitmq_federation_common"], context[:opts])
211211

212212
assert [
213-
[:rabbitmq_federation, :rabbitmq_stomp],
213+
[:rabbitmq_federation_common, :rabbitmq_stomp],
214214
%{
215215
mode: :online,
216-
started: [:rabbitmq_federation],
216+
started: [:rabbitmq_federation_common],
217217
stopped: [],
218-
enabled: [:rabbitmq_federation],
219-
set: [:rabbitmq_federation, :rabbitmq_stomp]
218+
enabled: [:rabbitmq_federation_common],
219+
set: [:rabbitmq_federation_common, :rabbitmq_stomp]
220220
}
221221
] ==
222222
Enum.to_list(test_stream1)
223223

224-
check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation], context)
224+
check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation_common], context)
225225

226226
assert_equal_sets(
227-
[:amqp_client, :rabbitmq_federation, :rabbitmq_stomp],
227+
[:amqp_client, :rabbitmq_federation_common, :rabbitmq_stomp],
228228
currently_active_plugins(context)
229229
)
230230

@@ -236,24 +236,24 @@ defmodule EnablePluginsCommandTest do
236236
set_enabled_plugins([], :online, context[:opts][:node], context[:opts])
237237

238238
assert {:stream, test_stream} =
239-
@command.run(["rabbitmq_stomp", "rabbitmq_federation"], context[:opts])
239+
@command.run(["rabbitmq_stomp", "rabbitmq_federation_common"], context[:opts])
240240

241241
assert [
242-
[:rabbitmq_federation, :rabbitmq_stomp],
242+
[:rabbitmq_federation_common, :rabbitmq_stomp],
243243
%{
244244
mode: :online,
245-
started: [:rabbitmq_federation, :rabbitmq_stomp],
245+
started: [:rabbitmq_federation_common, :rabbitmq_stomp],
246246
stopped: [],
247-
enabled: [:rabbitmq_federation, :rabbitmq_stomp],
248-
set: [:rabbitmq_federation, :rabbitmq_stomp]
247+
enabled: [:rabbitmq_federation_common, :rabbitmq_stomp],
248+
set: [:rabbitmq_federation_common, :rabbitmq_stomp]
249249
}
250250
] ==
251251
Enum.to_list(test_stream)
252252

253-
check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation], context)
253+
check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation_common], context)
254254

255255
assert_equal_sets(
256-
[:amqp_client, :rabbitmq_federation, :rabbitmq_stomp],
256+
[:amqp_client, :rabbitmq_federation_common, :rabbitmq_stomp],
257257
currently_active_plugins(context)
258258
)
259259

@@ -262,18 +262,18 @@ defmodule EnablePluginsCommandTest do
262262

263263
test "run: does not enable an already implicitly enabled plugin", context do
264264
# Clears enabled plugins file and stop all plugins
265-
set_enabled_plugins([:rabbitmq_federation], :online, context[:opts][:node], context[:opts])
265+
set_enabled_plugins([:rabbitmq_federation_common], :online, context[:opts][:node], context[:opts])
266266
assert {:stream, test_stream} = @command.run(["amqp_client"], context[:opts])
267267

268268
assert [
269-
[:rabbitmq_federation],
270-
%{mode: :online, started: [], stopped: [], enabled: [], set: [:rabbitmq_federation]}
269+
[:rabbitmq_federation_common],
270+
%{mode: :online, started: [], stopped: [], enabled: [], set: [:rabbitmq_federation_common]}
271271
] ==
272272
Enum.to_list(test_stream)
273273

274-
check_plugins_enabled([:rabbitmq_federation], context)
274+
check_plugins_enabled([:rabbitmq_federation_common], context)
275275

276-
assert [:amqp_client, :rabbitmq_federation] ==
276+
assert [:amqp_client, :rabbitmq_federation_common] ==
277277
currently_active_plugins(context)
278278

279279
reset_enabled_plugins_to_preconfigured_defaults(context)

‎deps/rabbitmq_cli/test/plugins/is_enabled_command_test.exs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ defmodule PluginIsEnabledCommandTest do
9999

100100
assert match?(
101101
{:ok, _},
102-
assert(@command.run(["rabbitmq_stomp", "rabbitmq_federation"], opts))
102+
assert(@command.run(["rabbitmq_stomp", "rabbitmq_federation_common"], opts))
103103
)
104104
end
105105

0 commit comments

Comments
 (0)