[ARVADOS] updated: 2a5192a38e2d5cde2f7b974c0f6ec5a615d6e139

[git at public.curoverse.com]

Summary of changes:
 .../controllers/collections_controller_test.rb     | 30 +++++++++++++++++++---
 services/api/Gemfile                               |  2 +-
 services/api/Gemfile.lock                          |  6 ++---
 services/api/app/models/collection.rb              | 10 ++++++++
 services/api/db/structure.sql                      |  1 -
 services/api/test/fixtures/collections.yml         |  2 +-
 .../functional/arvados/v1/nodes_controller_test.rb |  9 +++++++
 services/api/test/helpers/manifest_examples.rb     |  2 +-
 services/api/test/unit/collection_test.rb          | 18 ++++++-------
 services/api/test/unit/node_test.rb                |  7 -----
 10 files changed, 61 insertions(+), 26 deletions(-)

       via  2a5192a38e2d5cde2f7b974c0f6ec5a615d6e139 (commit)
       via  3d078f8d6387e64eb6f0b844d2fe784a0be45230 (commit)
       via  bb42f7d7d8320474c3e05e9e2185e7923feb1606 (commit)
       via  d6c2c9f1446c35a23f7dc1f73de398c4484e0cbe (commit)
       via  9020972ed0ea1395a9978363a34ddc8dfa77ee48 (commit)
       via  ad1f68c37d46e56916e18996e14405ed9dab7d35 (commit)
       via  e81225f0a847dfd14d97acbab775a9b3e0e6cb9b (commit)
       via  88ce56692e75cebdedc983fcb00aa48ea60aba8b (commit)
       via  88038b52936824be2bd2127c03d54e647cd1ff7e (commit)
      from  82a3d53af36a8374a4a1f28a19c69feabe8ca217 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2a5192a38e2d5cde2f7b974c0f6ec5a615d6e139
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 18 10:47:54 2015 -0400

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

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 7ea231e..d2f5669 100644
--- 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 ef50036..e5b8835 100644
--- 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

commit 3d078f8d6387e64eb6f0b844d2fe784a0be45230
Merge: 82a3d53 bb42f7d
Author: radhika <radhika at curoverse.com>
Date:   Thu Jun 18 10:22:55 2015 -0400

    Merge branch 'master' into 6156-hostnames-in-nodes


-----------------------------------------------------------------------


hooks/post-receive
--