[ARVADOS] updated: cfa2c529c7c8105e4d424b404db2c48ff2066e27

Git user git at public.curoverse.com
Thu Oct 20 09:13:22 EDT 2016


Summary of changes:
 services/api/test/functional/arvados/v1/jobs_controller_test.rb   | 3 ++-
 services/api/test/functional/arvados/v1/schema_controller_test.rb | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

       via  cfa2c529c7c8105e4d424b404db2c48ff2066e27 (commit)
      from  f84926fc3f934ea1958c810637851ec91994fc16 (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 cfa2c529c7c8105e4d424b404db2c48ff2066e27
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Oct 20 09:11:08 2016 -0400

    10291: Test multiple disabled APIs.

diff --git a/services/api/test/functional/arvados/v1/jobs_controller_test.rb b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
index 34871ef..3c11b3e 100644
--- a/services/api/test/functional/arvados/v1/jobs_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
@@ -510,7 +510,8 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   end
 
   test 'jobs.create disabled in config' do
-    Rails.configuration.disable_api_methods = ["jobs.create"]
+    Rails.configuration.disable_api_methods = ["jobs.create",
+                                               "pipeline_instances.create"]
     authorize_with :active
     post :create, job: {
       script: "hash",
diff --git a/services/api/test/functional/arvados/v1/schema_controller_test.rb b/services/api/test/functional/arvados/v1/schema_controller_test.rb
index ee132f0..2e370ec 100644
--- a/services/api/test/functional/arvados/v1/schema_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/schema_controller_test.rb
@@ -52,11 +52,13 @@ class Arvados::V1::SchemaControllerTest < ActionController::TestCase
   end
 
   test "non-empty disable_api_methods" do
-    Rails.configuration.disable_api_methods = ['jobs.create']
+    Rails.configuration.disable_api_methods =
+      ['jobs.create', 'pipeline_instances.create', 'pipeline_templates.create']
     get :index
     assert_response :success
     discovery_doc = JSON.parse(@response.body)
-    refute_includes(discovery_doc['resources']['jobs']['methods'].keys(),
-                    'create')
+    ['jobs', 'pipeline_instances', 'pipeline_templates'].each do |r|
+      refute_includes(discovery_doc['resources'][r]['methods'].keys(), 'create')
+    end
   end
 end

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list