Merge branch 'master' into github-3408-production-datamanager

[arvados.git] / services / api / test / functional / arvados / v1 / nodes_controller_test.rb

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 d74450587dc222524a73c7a604a59643bdd6e826..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
@@ -108,6 +108,14 @@ class Arvados::V1::NodesControllerTest < ActionController::TestCase
     assert_nil(json_response["job"], "spectator can see node's assigned job")
   end
 
+  [:admin, :spectator].each do |user|
+    test "select param does not break node list for #{user}" do
+      authorize_with user
+      get :index, {select: ['domain']}
+      assert_response :success
+    end
+  end
+
   test "admin can associate a job with a node" do
     changed_node = nodes(:idle)
     assigned_job = jobs(:queued)
@@ -165,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