cli

Author: dumbbell

deps/rabbitmq_cli/test/ctl/change_cluster_node_type_command_test.exs

@@ -64,7 +64,7 @@ defmodule ChangeClusterNodeTypeCommandTest do
     case :rabbit_misc.rpc_call(node, :rabbit_khepri, :is_enabled, []) do
       true ->
         assert match?(
-                 :ok,
+                 {:error, _},
                  @command.run(["ram"], context[:opts])
                )
 

deps/rabbitmq_cli/test/ctl/force_boot_command_test.exs

@@ -37,14 +37,21 @@ defmodule ForceBootCommandTest do
   end
 
   test "run: sets a force boot marker file on target node", context do
-    stop_rabbitmq_app()
-    on_exit(fn -> start_rabbitmq_app() end)
-    assert @command.run([], context[:opts]) == :ok
-    data_dir = :rpc.call(get_rabbit_hostname(), :rabbit, :data_dir, [])
-
-    path = Path.join(data_dir, "force_load")
-    assert File.exists?(path)
-    File.rm(path)
+    node = get_rabbit_hostname()
+    case :rabbit_misc.rpc_call(node, :rabbit_khepri, :is_enabled, []) do
+      true ->
+        :ok
+
+      false ->
+        stop_rabbitmq_app()
+        on_exit(fn -> start_rabbitmq_app() end)
+        assert @command.run([], context[:opts]) == :ok
+        data_dir = :rpc.call(node, :rabbit, :data_dir, [])
+
+        path = Path.join(data_dir, "force_load")
+        assert File.exists?(path)
+        File.rm(path)
+    end
   end
 
   test "run: if RABBITMQ_MNESIA_DIR is defined, creates a force boot marker file" do

deps/rabbitmq_cli/test/ctl/force_reset_command_test.exs

@@ -44,7 +44,15 @@ defmodule ForceResetCommandTest do
   test "run: reset request to an active node with a running rabbit app fails", context do
     add_vhost("some_vhost")
     assert vhost_exists?("some_vhost")
-    assert match?({:error, :mnesia_unexpectedly_running}, @command.run([], context[:opts]))
+    node = get_rabbit_hostname()
+    ret = @command.run([], context[:opts])
+    case :rabbit_misc.rpc_call(node, :rabbit_khepri, :is_enabled, []) do
+      true ->
+        assert match?({:error, :rabbitmq_unexpectedly_running}, ret)
+
+      false ->
+        assert match?({:error, :mnesia_unexpectedly_running}, ret)
+    end
     assert vhost_exists?("some_vhost")
   end
 

deps/rabbitmq_cli/test/diagnostics/schema_info_command_test.exs

@@ -21,30 +21,35 @@ defmodule SchemaInfoCommandTest do
     }
   end
 
+  @tag :mnesia
   test "merge_defaults: adds all keys if none specificed", context do
     default_keys = ~w(name cookie active_replicas user_properties)
 
     {keys, _} = @command.merge_defaults([], context[:opts])
     assert default_keys == keys
   end
 
+  @tag :mnesia
   test "merge_defaults: includes table headers by default", _context do
     {_, opts} = @command.merge_defaults([], %{})
     assert opts[:table_headers]
   end
 
+  @tag :mnesia
   test "validate: returns bad_info_key on a single bad arg", context do
     assert @command.validate(["quack"], context[:opts]) ==
              {:validation_failure, {:bad_info_key, [:quack]}}
   end
 
+  @tag :mnesia
   test "validate: returns multiple bad args return a list of bad info key values", context do
     result = @command.validate(["quack", "oink"], context[:opts])
     assert match?({:validation_failure, {:bad_info_key, _}}, result)
     {_, {_, keys}} = result
     assert :lists.sort(keys) == [:oink, :quack]
   end
 
+  @tag :mnesia
   test "validate: return bad_info_key on mix of good and bad args", context do
     assert @command.validate(["quack", "cookie"], context[:opts]) ==
              {:validation_failure, {:bad_info_key, [:quack]}}
@@ -56,12 +61,14 @@ defmodule SchemaInfoCommandTest do
              {:validation_failure, {:bad_info_key, [:oink]}}
   end
 
+  @tag :mnesia
   @tag test_timeout: 0
   test "run: timeout causes command to return badrpc", context do
     assert run_command_to_list(@command, [["source_name"], context[:opts]]) ==
              {:badrpc, :timeout}
   end
 
+  @tag :mnesia
   test "run: can filter info keys", context do
     wanted_keys = ~w(name access_mode)
 
@@ -71,6 +78,7 @@ defmodule SchemaInfoCommandTest do
            )
   end
 
+  @tag :mnesia
   test "banner" do
     assert String.starts_with?(@command.banner([], %{node: "node@node"}), "Asking node")
   end