6156: convert the ping-should-fail test when hostname config is malformed into a...

diff --git a/services/api/test/functional/arvados/v1/nodes_controller_test.rb b/services/api/test/functional/arvados/v1/nodes_controller_test.rb
index 7ea231eecb9f28a35d8ccf67db2727f33446ff84..d2f56699ed0c0a858b3d296bd1a799dd605fa4a0 100644 (file)
--- a/services/api/test/functional/arvados/v1/nodes_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/nodes_controller_test.rb
@@ -173,4 +173,13 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
     assert_equal(jobs(:nearly_finished_job).uuid, json_response["job_uuid"],
                  "mismatched job UUID after ping update")
   end
+
+  test "node should fail ping with invalid hostname config format" do
+    Rails.configuration.assign_node_hostname = 'compute%<slot_number>04'  # should end with "04d"
+    post :ping, {
+      id: nodes(:new_with_no_hostname).uuid,
+      ping_secret: nodes(:new_with_no_hostname).info['ping_secret'],
+    }
+    assert_response 422
+  end
 end

diff --git a/services/api/test/unit/node_test.rb b/services/api/test/unit/node_test.rb
index ef500362d7ba758136bb3c683ebeb0bbaf6475e3..e5b88354fb128e1308c1a00a7c9e297928f191dd 100644 (file)
--- a/services/api/test/unit/node_test.rb
+++ b/services/api/test/unit/node_test.rb
@@ -125,11 +125,4 @@ class NodeTest < ActiveSupport::TestCase
     refute_nil node2.slot_number
     assert_equal "custom1", node2.hostname
   end
-
-  test "ping node with no hostname and malformed config and expect nil for hostname" do
-    Rails.configuration.assign_node_hostname = 'compute%<slot_number>04'  # should end with "04d"
-    assert_raise ArgumentError do
-      ping_node(:new_with_no_hostname, {})
-    end
-  end
 end