[ARVADOS] updated: db634de5a4f34e97cb5428390800076ef1ac4106
Git user
git at public.curoverse.com
Wed Nov 9 12:36:50 EST 2016
Summary of changes:
.../test/controllers/disabled_api_test.rb | 31 ++----
.../test/integration/pipeline_instances_test.rb | 13 ++-
build/run-build-docker-jobs-image.sh | 4 +-
build/run-build-packages.sh | 4 +-
build/run-tests.sh | 4 +-
.../_container_runtime_constraints.liquid | 1 +
sdk/cwl/arvados_cwl/__init__.py | 36 +++++--
sdk/cwl/arvados_cwl/arvcontainer.py | 10 +-
sdk/cwl/arvados_cwl/arvdocker.py | 26 ++++-
sdk/cwl/arvados_cwl/arvjob.py | 24 ++---
sdk/cwl/arvados_cwl/arvworkflow.py | 2 +
sdk/cwl/arvados_cwl/crunch_script.py | 7 +-
sdk/cwl/arvados_cwl/pathmapper.py | 33 +++---
sdk/cwl/arvados_cwl/runner.py | 18 +++-
sdk/cwl/setup.py | 2 +-
sdk/cwl/test_with_arvbox.sh | 19 ++--
sdk/cwl/tests/mock_discovery.py | 13 +++
sdk/cwl/tests/test_container.py | 100 ++++++++++--------
sdk/cwl/tests/test_job.py | 117 ++++++++++++---------
sdk/cwl/tests/test_make_output.py | 14 ++-
sdk/cwl/tests/test_pathmapper.py | 3 +-
sdk/cwl/tests/test_submit.py | 107 +++++++++++++++++--
sdk/go/arvados/container.go | 9 +-
sdk/python/arvados/events.py | 77 +++++++++-----
.../controllers/arvados/v1/groups_controller.rb | 13 +++
services/api/app/models/arvados_model.rb | 2 +-
services/api/app/models/container_request.rb | 10 +-
services/api/app/models/log.rb | 2 +-
services/api/app/models/node.rb | 30 +++---
services/api/config/application.default.yml | 3 +
services/api/test/fixtures/nodes.yml | 6 +-
services/api/test/unit/container_request_test.rb | 33 +++++-
services/api/test/unit/log_test.rb | 10 +-
services/api/test/unit/node_test.rb | 27 +++++
services/crunch-run/crunchrun.go | 5 +
services/crunch-run/crunchrun_test.go | 22 ++++
services/fuse/arvados_fuse/__init__.py | 7 +-
services/keepstore/azure_blob_volume.go | 13 +++
services/keepstore/s3_volume.go | 58 +++++++---
tools/arvbox/lib/arvbox/docker/crunch-setup.sh | 1 +
tools/keep-exercise/keep-exercise.go | 19 ++--
41 files changed, 651 insertions(+), 284 deletions(-)
create mode 100644 sdk/cwl/tests/mock_discovery.py
via db634de5a4f34e97cb5428390800076ef1ac4106 (commit)
via aa297eb5d6062c9501ac94a6116c597a78a23240 (commit)
via 287a03d273629ef15f77721ad2c7ce572fb5c078 (commit)
via b1b7794d253c653a370200c2b33d477d3f7f231e (commit)
via 5c274cd1249ce0f5e0048f8e0974e36deee8c9cc (commit)
via 97eb0ce9a8a83af1acff17d3dfb66c6ca7522678 (commit)
via b03f167f42f9803814e2d22c4de68a30a3bc9dae (commit)
via c3cc1d58b64940a2bd79f27a9d0fdc50318dbb99 (commit)
via 0d2a561091b777dfb7735d842a88f8529f4f982a (commit)
via dac167d2d3d259de8fd70d1289dbbe65c7974d4a (commit)
via 928c4a5b8d3645994d99c881914bcf1683e69d1d (commit)
via b8641edca2fa6bb3325b057264a81b6ce71b9f19 (commit)
via cd391613ae717c90ede24f220695c277ecd095ce (commit)
via 66b8e9d2f1178ddec2924eadae721e2dfd9a4a67 (commit)
via d158890921e8821782420711513a8b28ce0a1280 (commit)
via 39536d8dd7f0a6ab89e106cd065830f1cbb067b1 (commit)
via 36bbbee25ab89a499f4015fb39845cc2d911aa63 (commit)
via 1c1f12b1f2c32cdee5fab278f38a65ec246cbbf0 (commit)
via c863f911c9a55203bbe0bd3735162084b94f582f (commit)
via b0c0e63f7f3c5a58947db8d4dcc8572362f0e7a1 (commit)
via 2105942b856ac9621c2887f9e86636b4d7f17a14 (commit)
via 8e56df8796bf822e6c5181d80715a3a217320696 (commit)
via ac9e30c830fd8acdd04ff2a8067f3b33d95325f5 (commit)
via 5e4f310a2024cb8f9dc509f94c71467508341851 (commit)
via 701598520c45f790fdc02c1d046a29a8f3b84380 (commit)
via c2af1e524e87fa76f51bed62d4821d4fe1b7fcc0 (commit)
via eba27784b1696432c48bc41ab0a4fba7e405f3b9 (commit)
via 12b82d52759ea35c7c9fcdd243a1205c92d53f49 (commit)
via 23f0ec9bc86cc786f995c6b123b912b8ba3ce4d7 (commit)
via 5894f831aed536618868f2c78fee7c409fd9b0ab (commit)
via 7ea4e4ac71ef2f3dde92ac1468127bfd766add03 (commit)
via ebda23ff4bf42b24dc3c11d9ccb3b053c07276c9 (commit)
via 17ac6b9f8462d63b1162a96f4c182ccc29217c5c (commit)
via a29758043e415cd436b23e61ba813f9c42aedaaa (commit)
via 3775dc3ddeb90fe0b8492c38782c09421da21194 (commit)
via 251dca0361de352e4866f472c4b1b2deb0edd78b (commit)
via caec2646101094c2b7a57cf5f53b858d4f724fe4 (commit)
via 2a0472e6b0e94265d78fb22b5652619a7700e86b (commit)
via 98fcb678a39f72945a9c947315beb31178bd4fc3 (commit)
via 1d5f5f8f44f64f91a5d6ff8785a5863b707515fe (commit)
via 0636ab69b759c04389433d291864366aab848225 (commit)
via c939c82545868821762e802d4b28535749504b55 (commit)
via 63d0f330ab35e59dd871508e936ff74c249b94a4 (commit)
via 82dc8eadba19c7727deeb4056f500fe8e4ba37a6 (commit)
via 3cb54d529632df28dd14d1973f70d5fdbd98e2bb (commit)
via 54c1afd044ab18db82d897484cae2153bc14a10c (commit)
via 0a05151f05de44233d3c6ae0d53ecae2855f5a11 (commit)
via cc3857d9fdcd7588af329a9b2452e0ef09eb68a4 (commit)
via 120a2268606d73317ab2353d79c3046017300f81 (commit)
via 61b286dcf40fa85319cceb69e16660aebc71b942 (commit)
via 7a3816393dddc19f67838ae495b83d32e90182d4 (commit)
via 48cb427d89232516d0044464eb00efdcef6ba365 (commit)
from b3883baf33bb023917b2b8a0082eb7635dab38a6 (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 db634de5a4f34e97cb5428390800076ef1ac4106
Author: radhika <radhika at curoverse.com>
Date: Wed Nov 9 12:36:13 2016 -0500
10310: simplify tests
diff --git a/apps/workbench/test/controllers/disabled_api_test.rb b/apps/workbench/test/controllers/disabled_api_test.rb
index 7aa87f0..1b59088 100644
--- a/apps/workbench/test/controllers/disabled_api_test.rb
+++ b/apps/workbench/test/controllers/disabled_api_test.rb
@@ -2,27 +2,16 @@ require 'test_helper'
require 'helpers/share_object_helper'
class DisabledApiTest < ActionController::TestCase
- [
- [:admin, false],
- [:admin, true],
- ].each do |user, crunch2|
- test "dashboard recent processes as #{user} with #{if crunch2 then 'crunch2' else 'crunch1' end}" do
- @controller = ProjectsController.new
+ test "dashboard recent processes when pipeline_instance index API is disabled" do
+ @controller = ProjectsController.new
- if crunch2
- dd = ArvadosApiClient.new_or_current.discovery.deep_dup
- dd[:resources][:pipeline_instances][:methods].delete(:index)
- ArvadosApiClient.any_instance.stubs(:discovery).returns(dd)
- end
+ dd = ArvadosApiClient.new_or_current.discovery.deep_dup
+ dd[:resources][:pipeline_instances][:methods].delete(:index)
+ ArvadosApiClient.any_instance.stubs(:discovery).returns(dd)
- get :index, {}, session_for(user)
- assert_includes @response.body, "zzzzz-xvhdp-cr4runningcntnr"
- if crunch2
- assert_not_includes @response.body, "zzzzz-d1hrv-1yfj6xkidf2muk3"
- else
- assert_includes @response.body, "zzzzz-d1hrv-1yfj6xkidf2muk3"
- end
- end
+ get :index, {}, session_for(:active)
+ assert_includes @response.body, "zzzzz-xvhdp-cr4runningcntnr" # expect crs
+ assert_not_includes @response.body, "zzzzz-d1hrv-" # expect no pipelines
end
[
@@ -31,7 +20,7 @@ class DisabledApiTest < ActionController::TestCase
[:pipeline_instances, PipelineInstancesController.new],
[:pipeline_templates, PipelineTemplatesController.new],
].each do |ctrl_name, ctrl|
- test "#{ctrl_name} index page with crunch2" do
+ test "#{ctrl_name} index page when API is disabled" do
@controller = ctrl
dd = ArvadosApiClient.new_or_current.discovery.deep_dup
@@ -39,7 +28,7 @@ class DisabledApiTest < ActionController::TestCase
ArvadosApiClient.any_instance.stubs(:discovery).returns(dd)
get :index, {}, session_for(:active)
- assert_includes @response.body, "index method is not supported for #{ctrl_name.to_s}"
+ assert_response 404
end
end
commit aa297eb5d6062c9501ac94a6116c597a78a23240
Merge: b3883ba 287a03d
Author: radhika <radhika at curoverse.com>
Date: Wed Nov 9 09:54:18 2016 -0500
Merge branch '10460-cwl-staging-fix' of git.curoverse.com:arvados into 10310-crunch2-only-wb
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list