From 597fb419f3a7dec567dc0329898edc5c52a28d93 Mon Sep 17 00:00:00 2001 From: Diana Parra Corbacho Date: Mon, 26 May 2025 17:31:31 +0200 Subject: [PATCH] Update rabbitmq_cli federation test dependency --- .../plugins/disable_plugins_command_test.exs | 28 +++++++-------- .../plugins/enable_plugins_command_test.exs | 36 +++++++++---------- .../test/plugins/set_plugins_command_test.exs | 24 ++++++------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/deps/rabbitmq_cli/test/plugins/disable_plugins_command_test.exs b/deps/rabbitmq_cli/test/plugins/disable_plugins_command_test.exs index f8b5ef5a64..1af98f3305 100644 --- a/deps/rabbitmq_cli/test/plugins/disable_plugins_command_test.exs +++ b/deps/rabbitmq_cli/test/plugins/disable_plugins_command_test.exs @@ -105,14 +105,14 @@ defmodule DisablePluginsCommandTest do @command.run(["rabbitmq_stomp"], Map.merge(context[:opts], %{node: :nonode})) assert [ - [:rabbitmq_federation], - %{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_federation]} + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], + %{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation]} ] == Enum.to_list(test_stream) assert {:ok, [[:rabbitmq_federation]]} == :file.consult(context[:opts][:enabled_plugins_file]) - assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] == + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] == Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, [])) end @@ -125,13 +125,13 @@ defmodule DisablePluginsCommandTest do ) assert [ - [:rabbitmq_federation], - %{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_federation]} + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], + %{mode: :offline, disabled: [:rabbitmq_stomp], set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation]} ] == Enum.to_list(test_stream) assert {:ok, [[:rabbitmq_federation]]} == :file.consult(context[:opts][:enabled_plugins_file]) - assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] == + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] == Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, [])) end @@ -145,7 +145,7 @@ defmodule DisablePluginsCommandTest do assert [ [:rabbitmq_stomp], - %{mode: :offline, disabled: [:rabbitmq_federation], set: [:rabbitmq_stomp]} + %{mode: :offline, disabled: [:rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_exchange_federation, :rabbitmq_federation], set: [:rabbitmq_stomp]} ] == Enum.to_list(test_stream0) assert {:ok, [[:rabbitmq_stomp]]} == :file.consult(context[:opts][:enabled_plugins_file]) @@ -166,20 +166,20 @@ defmodule DisablePluginsCommandTest do assert {:stream, test_stream0} = @command.run(["rabbitmq_stomp"], context[:opts]) assert [ - [:rabbitmq_federation], + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], %{ mode: :online, started: [], stopped: [:rabbitmq_stomp], disabled: [:rabbitmq_stomp], - set: [:rabbitmq_federation] + set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation] } ] == Enum.to_list(test_stream0) assert {:ok, [[:rabbitmq_federation]]} == :file.consult(context[:opts][:enabled_plugins_file]) - assert [:amqp_client, :rabbitmq_federation] == + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation] == Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, [])) assert {:stream, test_stream1} = @command.run(["rabbitmq_federation"], context[:opts]) @@ -189,8 +189,8 @@ defmodule DisablePluginsCommandTest do %{ mode: :online, started: [], - stopped: [:rabbitmq_federation], - disabled: [:rabbitmq_federation], + stopped: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], + disabled: [:rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_exchange_federation, :rabbitmq_federation], set: [] } ] == @@ -214,7 +214,7 @@ defmodule DisablePluginsCommandTest do |> Map.update!(:stopped, &Enum.sort/1) |> Map.update!(:disabled, &Enum.sort/1) - expected_list = Enum.sort([:rabbitmq_federation, :rabbitmq_stomp]) + expected_list = Enum.sort([:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp]) assert [ [], @@ -243,7 +243,7 @@ defmodule DisablePluginsCommandTest do |> Map.update!(:stopped, &Enum.sort/1) |> Map.update!(:disabled, &Enum.sort/1) - expected_list = Enum.sort([:rabbitmq_federation, :rabbitmq_stomp]) + expected_list = Enum.sort([:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp]) assert [ [], diff --git a/deps/rabbitmq_cli/test/plugins/enable_plugins_command_test.exs b/deps/rabbitmq_cli/test/plugins/enable_plugins_command_test.exs index 424a9ade1a..6ee5b2c957 100644 --- a/deps/rabbitmq_cli/test/plugins/enable_plugins_command_test.exs +++ b/deps/rabbitmq_cli/test/plugins/enable_plugins_command_test.exs @@ -120,7 +120,7 @@ defmodule EnablePluginsCommandTest do check_plugins_enabled([:rabbitmq_stomp], context) - assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] == + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] == currently_active_plugins(context) end @@ -144,7 +144,7 @@ defmodule EnablePluginsCommandTest do check_plugins_enabled([:rabbitmq_stomp], context) assert_equal_sets( - [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp], + [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], currently_active_plugins(context) ) end @@ -174,11 +174,11 @@ defmodule EnablePluginsCommandTest do ) assert [ - [:rabbitmq_federation, :rabbitmq_stomp], + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], %{ mode: :offline, - enabled: [:rabbitmq_federation], - set: [:rabbitmq_federation, :rabbitmq_stomp] + enabled: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], + set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] } ] == Enum.to_list(test_stream1) @@ -210,13 +210,13 @@ defmodule EnablePluginsCommandTest do {:stream, test_stream1} = @command.run(["rabbitmq_federation"], context[:opts]) assert [ - [:rabbitmq_federation, :rabbitmq_stomp], + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], %{ mode: :online, - started: [:rabbitmq_federation], + started: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], stopped: [], - enabled: [:rabbitmq_federation], - set: [:rabbitmq_federation, :rabbitmq_stomp] + enabled: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], + set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] } ] == Enum.to_list(test_stream1) @@ -224,7 +224,7 @@ defmodule EnablePluginsCommandTest do check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation], context) assert_equal_sets( - [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp], + [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], currently_active_plugins(context) ) @@ -239,13 +239,13 @@ defmodule EnablePluginsCommandTest do @command.run(["rabbitmq_stomp", "rabbitmq_federation"], context[:opts]) assert [ - [:rabbitmq_federation, :rabbitmq_stomp], + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], %{ mode: :online, - started: [:rabbitmq_federation, :rabbitmq_stomp], + started: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], stopped: [], - enabled: [:rabbitmq_federation, :rabbitmq_stomp], - set: [:rabbitmq_federation, :rabbitmq_stomp] + enabled: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], + set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] } ] == Enum.to_list(test_stream) @@ -253,7 +253,7 @@ defmodule EnablePluginsCommandTest do check_plugins_enabled([:rabbitmq_stomp, :rabbitmq_federation], context) assert_equal_sets( - [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp], + [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], currently_active_plugins(context) ) @@ -266,14 +266,14 @@ defmodule EnablePluginsCommandTest do assert {:stream, test_stream} = @command.run(["amqp_client"], context[:opts]) assert [ - [:rabbitmq_federation], - %{mode: :online, started: [], stopped: [], enabled: [], set: [:rabbitmq_federation]} + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], + %{mode: :online, started: [], stopped: [], enabled: [], set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation]} ] == Enum.to_list(test_stream) check_plugins_enabled([:rabbitmq_federation], context) - assert [:amqp_client, :rabbitmq_federation] == + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation] == currently_active_plugins(context) reset_enabled_plugins_to_preconfigured_defaults(context) diff --git a/deps/rabbitmq_cli/test/plugins/set_plugins_command_test.exs b/deps/rabbitmq_cli/test/plugins/set_plugins_command_test.exs index e25af5c1f5..e78131d41e 100644 --- a/deps/rabbitmq_cli/test/plugins/set_plugins_command_test.exs +++ b/deps/rabbitmq_cli/test/plugins/set_plugins_command_test.exs @@ -92,7 +92,7 @@ defmodule SetPluginsCommandTest do assert {:ok, [[:rabbitmq_stomp]]} = :file.consult(context[:opts][:enabled_plugins_file]) - assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] = + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] = Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, [])) end @@ -108,7 +108,7 @@ defmodule SetPluginsCommandTest do assert {:ok, [[:rabbitmq_stomp]]} = :file.consult(context[:opts][:enabled_plugins_file]) - assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] = + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] = Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, [])) end @@ -120,7 +120,7 @@ defmodule SetPluginsCommandTest do %{ mode: :online, started: [], - stopped: [:rabbitmq_federation], + stopped: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], set: [:rabbitmq_stomp] } ] = Enum.to_list(test_stream0) @@ -133,18 +133,18 @@ defmodule SetPluginsCommandTest do assert {:stream, test_stream1} = @command.run(["rabbitmq_federation"], context[:opts]) assert [ - [:rabbitmq_federation], + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], %{ mode: :online, - started: [:rabbitmq_federation], + started: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation], stopped: [:rabbitmq_stomp], - set: [:rabbitmq_federation] + set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation] } ] = Enum.to_list(test_stream1) assert {:ok, [[:rabbitmq_federation]]} = :file.consult(context[:opts][:enabled_plugins_file]) - assert [:amqp_client, :rabbitmq_federation] = + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation] = Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, [])) end @@ -156,7 +156,7 @@ defmodule SetPluginsCommandTest do %{ mode: :online, started: [], - stopped: [:rabbitmq_federation, :rabbitmq_stomp], + stopped: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], set: [] } ] = Enum.to_list(test_stream) @@ -174,19 +174,19 @@ defmodule SetPluginsCommandTest do @command.run(["rabbitmq_federation", "rabbitmq_stomp"], context[:opts]) assert [ - [:rabbitmq_federation, :rabbitmq_stomp], + [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], %{ mode: :online, - started: [:rabbitmq_federation, :rabbitmq_stomp], + started: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp], stopped: [], - set: [:rabbitmq_federation, :rabbitmq_stomp] + set: [:rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] } ] = Enum.to_list(test_stream) assert {:ok, [[:rabbitmq_federation, :rabbitmq_stomp]]} = :file.consult(context[:opts][:enabled_plugins_file]) - assert [:amqp_client, :rabbitmq_federation, :rabbitmq_stomp] = + assert [:amqp_client, :rabbitmq_exchange_federation, :rabbitmq_federation, :rabbitmq_federation_common, :rabbitmq_queue_federation, :rabbitmq_stomp] = Enum.sort(:rabbit_misc.rpc_call(context[:opts][:node], :rabbit_plugins, :active, [])) end