Skip to content

Commit

Permalink
Reuse --silent and --quiet in #10865
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed Mar 27, 2024
1 parent 6531bb4 commit fda9781
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 3 deletions.
Expand Up @@ -62,7 +62,10 @@ defmodule RabbitMQ.CLI.Plugins.Commands.ListCommand do

false ->
names = Enum.join(Enum.to_list(missing), ", ")
IO.puts("WARNING - plugins currently enabled but missing: #{names}\n")
if Config.output_less?(opts) do
true -> ok
false -> IO.puts("WARNING - plugins currently enabled but missing: #{names}\n")
end
end

implicit = :rabbit_plugins.dependencies(false, enabled, all)
Expand Down
52 changes: 51 additions & 1 deletion deps/rabbitmq_cli/test/plugins/list_plugins_command_test.exs
Expand Up @@ -38,7 +38,7 @@ defmodule ListPluginsCommandTest do
{:ok, [enabled_plugins]} = :file.consult(plugins_file)

IO.puts(
"plugins list tests will assume tnat #{Enum.join(enabled_plugins, ",")} is the list of enabled plugins to revert to"
"plugins list tests will assume that #{Enum.join(enabled_plugins, ",")} is the list of enabled plugins to revert to"
)

opts = %{
Expand Down Expand Up @@ -444,4 +444,54 @@ defmodule ListPluginsCommandTest do

assert_plugin_states(actual_plugins2, expected_plugins2)
end

test "run: lists all plugins with missing plugins warning control", context do
opts = Map.replace(context[:opts], :silent, true)
context = Map.replace(context, :opts, opts)

missing_plugin = :rabbitmq_non_existent

reset_enabled_plugins_to_preconfigured_defaults(context)

set_enabled_plugins(
[:rabbitmq_federation, missing_plugin],
:online,
context[:opts][:node],
context[:opts]
)

on_exit(fn ->
set_enabled_plugins(
[:rabbitmq_stomp, :rabbitmq_federation],
:online,
context[:opts][:node],
context[:opts]
)
end)

expected_plugins = [
%{name: :rabbitmq_federation, enabled: :enabled, running: true},
%{name: :rabbitmq_stomp, enabled: :not_enabled, running: false}
]

opts = context[:opts]

assert capture_io(fn ->
%{
plugins: actual_plugins
} = @command.run([".*"], opts)

assert_plugin_states(actual_plugins, expected_plugins)
end) =~ ~s//

opts = Map.replace(opts, :ignore_warnings, false)

assert capture_io(fn ->
%{
plugins: actual_plugins
} = @command.run([".*"], opts)

assert_plugin_states(actual_plugins, expected_plugins)
end) =~ ~s/WARNING - plugins currently enabled but missing: #{missing_plugin}\n/
end
end
2 changes: 1 addition & 1 deletion deps/rabbitmq_mqtt/BUILD.bazel
Expand Up @@ -168,7 +168,7 @@ rabbitmq_integration_suite(
runtime_deps = [
"@emqtt//:erlang_app",
],
)
)IO

rabbitmq_integration_suite(
name = "config_SUITE",
Expand Down

0 comments on commit fda9781

Please sign in to comment.