Fix cli tests

Author: ikavgo

deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/check_if_new_quorum_queue_replicas_have_finished_initial_sync.ex

@@ -24,7 +24,7 @@ defmodule RabbitMQ.CLI.Queues.Commands.CheckIfNewQuorumQueueReplicasHaveFinished
 
 #  use RabbitMQ.CLI.Core.AcceptsDefaultSwitchesAndTimeout
 #  use RabbitMQ.CLI.Core.MergesNoDefaults
-#  use RabbitMQ.CLI.Core.AcceptsNoPositionalArguments
+  use RabbitMQ.CLI.Core.AcceptsNoPositionalArguments
   use RabbitMQ.CLI.Core.RequiresRabbitAppRunning
 
   def merge_defaults(args, opts) do
@@ -52,16 +52,12 @@ defmodule RabbitMQ.CLI.Queues.Commands.CheckIfNewQuorumQueueReplicasHaveFinished
     timeout: :integer,
     type: :string
   ]
-  
-  def validate(_, _) do
-    :ok
-  end
 
-  def output({:error, {:unknown_queue_type, type}}, args) do
+  def output({:error, {:unknown_queue_type, type}}, _args) do
     {:error,
      %{
        "result" => "error",
-       "message" => "Unknown queue type #{args}"
+       "message" => "Unknown queue type #{type}"
      }}
   end
 

deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/grow_command.ex

@@ -147,14 +147,6 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
     "?"
   end
 
-  def output({:error, :not_found}, %{vhost: vhost, formatter: "json"}) do
-    {:error,
-     %{
-       "result" => "error",
-       "message" => "Target queue was not found in virtual host '#{vhost}'"
-     }}
-  end
-
   defp format_size({:error, size, _}) do
     size
   end

deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/shrink_command.ex

@@ -85,11 +85,11 @@ defmodule RabbitMQ.CLI.Queues.Commands.ShrinkCommand do
   # Implementation
   #
 
-  def format_output({:error, {:unknown_queue_type, type}}, args) do
+  def format_output({:error, {:unknown_queue_type, type}}, _args) do
     {:error,
      %{
        "result" => "error",
-       "message" => "Unknown queue type #{args}"
+       "message" => "Unknown queue type #{type}"
      }}
   end
 

deps/rabbitmq_cli/test/queues/check_if_new_quorum_queue_replicas_have_finished_initial_sync_test.exs

@@ -40,6 +40,6 @@ defmodule RabbitMQ.CLI.Queues.Commands.CheckIfNewQuorumQueueReplicasHaveFinished
 
   @tag test_timeout: 3000
   test "run: targeting an unreachable node throws a badrpc" do
-    assert match?({:badrpc, _}, @command.run([], %{node: :jake@thedog, vhost: "/", timeout: 200}))
+    assert match?({:badrpc, _}, @command.run([], %{node: :jake@thedog, vhost: "/", timeout: 200, type: "quorum"}))
   end
 end

deps/rabbitmq_cli/test/queues/check_if_node_is_quorum_critical_command_test.exs

@@ -40,6 +40,6 @@ defmodule RabbitMQ.CLI.Queues.Commands.CheckIfNodeIsQuorumCriticalCommandTest do
 
   @tag test_timeout: 3000
   test "run: targeting an unreachable node throws a badrpc" do
-    assert match?({:badrpc, _}, @command.run([], %{node: :jake@thedog, vhost: "/", timeout: 200}))
+    assert match?({:badrpc, _}, @command.run([], %{node: :jake@thedog, vhost: "/", timeout: 200, type: "quorum"}))
   end
 end

deps/rabbitmq_cli/test/queues/shrink_command_test.exs

@@ -26,7 +26,7 @@ defmodule RabbitMQ.CLI.Queues.Commands.ShrinkCommandTest do
   end
 
   test "merge_defaults: defaults to reporting complete results" do
-    assert @command.merge_defaults([], %{}) == {[], %{errors_only: false}}
+    assert @command.merge_defaults([], %{}) == {[], %{errors_only: false, type: "quorum"}}
   end
 
   test "validate: when no arguments are provided, returns a failure" do
@@ -55,7 +55,7 @@ defmodule RabbitMQ.CLI.Queues.Commands.ShrinkCommandTest do
              {:badrpc, _},
              @command.run(
                ["quorum-queue-a"],
-               Map.merge(context[:opts], %{node: :jake@thedog, vhost: "/", timeout: 200})
+               Map.merge(context[:opts], %{node: :jake@thedog, vhost: "/", timeout: 200, type: "quorum"})
              )
            )
   end