Fix test for @hostname case

deps/rabbitmq_cli/lib/rabbitmq/cli/core/helpers.ex

@@ -30,9 +30,15 @@ defmodule RabbitMQ.CLI.Core.Helpers do
   end
   def normalise_node(name) do
     case String.split(name, "@", parts: 2) do
-      [_,""] -> name <> "#{hostname()}" |> String.to_atom
-      [_,_] -> name |> String.to_atom
-      [_] -> name <> "@#{hostname()}" |> String.to_atom
+      [_,""] ->
+        name <> "#{hostname()}" |> String.to_atom
+      ["",hostname] ->
+        default_name = to_string(Config.get_option(:node))
+        default_name <> "@#{hostname}" |> String.to_atom
+      [_,_] ->
+        name |> String.to_atom
+      [_] ->
+        name <> "@#{hostname()}" |> String.to_atom
     end
   end
 

deps/rabbitmq_cli/test/core/helpers_test.exs

@@ -92,7 +92,8 @@ defmodule HelpersTest do
   end
 
   test "if input is a hostname without a node name, default node name is added" do
-    want = String.to_atom("rabbit_test@#{hostname()}")
+    default_name = RabbitMQ.CLI.Core.Config.get_option(:node)
+    want = String.to_atom("#{default_name}@#{hostname()}")
     got = @subject.normalise_node("@#{hostname()}")
     assert want == got
   end