[ARVADOS] updated: 48694918fb3e78857d921766784f04cc49dc1ab1

[git at public.curoverse.com]

Summary of changes:
 .../arvados/v1/keep_disks_controller_test.rb       | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

       via  48694918fb3e78857d921766784f04cc49dc1ab1 (commit)
      from  36975ebf86c37148ef38a5facd10fad2a977efc9 (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 48694918fb3e78857d921766784f04cc49dc1ab1
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 11:47:54 2014 -0400

    3889: break the "add keep disk with no filesystem_uuid" test into two tests, instead of doing two post actions in the same test.

diff --git a/services/api/test/functional/arvados/v1/keep_disks_controller_test.rb b/services/api/test/functional/arvados/v1/keep_disks_controller_test.rb
index a41531a..ea7b5b7 100644
--- a/services/api/test/functional/arvados/v1/keep_disks_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/keep_disks_controller_test.rb
@@ -16,18 +16,16 @@ class Arvados::V1::KeepDisksControllerTest < ActionController::TestCase
     assert_not_equal '', new_keep_disk['ping_secret']
   end
 
-  test "add keep disk with no filesystem_uuid" do
-    authorize_with :admin
-    opts = {
-      ping_secret: '',
-    }
-    post :ping, opts
-    assert_response :success
-    assert_not_nil JSON.parse(@response.body)['uuid']
-
-    post :ping, opts.merge(filesystem_uuid: '')
-    assert_response :success
-    assert_not_nil JSON.parse(@response.body)['uuid']
+  [
+    {ping_secret: ''},
+    {ping_secret: '', filesystem_uuid: ''},
+  ].each do |opts|
+    test "add keep disk with no filesystem_uuid #{opts}" do
+      authorize_with :admin
+      post :ping, opts
+      assert_response :success
+      assert_not_nil JSON.parse(@response.body)['uuid']
+    end
   end
 
   test "refuse to add keep disk without admin token" do

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


hooks/post-receive
--