[ARVADOS] updated: fada92364f7ab0aa7074f1b260b4d79ca7ab55eb
git at public.curoverse.com
git at public.curoverse.com
Fri Aug 1 16:11:59 EDT 2014
Summary of changes:
.../app/controllers/arvados/v1/jobs_controller.rb | 20 +++++-----
services/api/app/models/arvados_model.rb | 6 +++
.../test/fixtures/api_client_authorizations.yml | 6 +++
services/api/test/fixtures/links.yml | 46 ++++++++++++++++++++++
services/api/test/fixtures/users.yml | 11 ++++++
.../arvados/v1/groups_controller_test.rb | 30 ++++++++++++++
.../arvados/v1/job_reuse_controller_test.rb | 21 ++++++++++
7 files changed, 131 insertions(+), 9 deletions(-)
via fada92364f7ab0aa7074f1b260b4d79ca7ab55eb (commit)
via d579e7069ab2df27493180a36f2830ba7c10e6a6 (commit)
via b01bc9f64291554fea0e548d18081bb0fd1a7342 (commit)
via ee91e2ebc7759e1823edd376db938a785ad62f45 (commit)
via ad02c4a8569b1cbf7336b5d65beb065e17420d56 (commit)
from 42d84bd014b3ab3a1906c9ba68b39835765fe705 (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 fada92364f7ab0aa7074f1b260b4d79ca7ab55eb
Merge: d579e70 ad02c4a
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Aug 1 16:11:17 2014 -0400
Merge branch 'origin/3443-read-collections-from-name-links' refs #3443
Conflicts:
services/api/test/fixtures/links.yml
services/api/test/functional/arvados/v1/groups_controller_test.rb
diff --cc services/api/test/fixtures/links.yml
index 1dd6902,ebaeb78..ba0b1a6
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@@ -634,32 -634,18 +634,48 @@@ anonymous_group_can_read_empty_collecti
tail_uuid: zzzzz-j7d0g-anonymouspublic
head_uuid: d41d8cd98f00b204e9800998ecf8427e+0
+job_reader_can_read_previous_job_run:
+ # Permission link giving job_reader permission
+ # to read previous_job_run
+ uuid: zzzzz-o0j2j-8bbd851795ebafd
+ owner_uuid: zzzzz-tpzed-000000000000000
+ created_at: 2014-06-13 20:42:26 -0800
+ modified_by_client_uuid: zzzzz-tpzed-000000000000000
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-06-13 20:42:26 -0800
+ updated_at: 2014-06-13 20:42:26 -0800
+ link_class: permission
+ name: can_read
+ tail_uuid: zzzzz-tpzed-905b42d1dd4a354
+ head_uuid: zzzzz-8i9sb-cjs4pklxxjykqqq
+
+job_reader_can_read_foo_repo:
+ # Permission link giving job_reader permission
+ # to read foo_repo
+ uuid: zzzzz-o0j2j-072ec05dc9487f8
+ owner_uuid: zzzzz-tpzed-000000000000000
+ created_at: 2014-06-13 20:42:26 -0800
+ modified_by_client_uuid: zzzzz-tpzed-000000000000000
+ modified_by_user_uuid: zzzzz-tpzed-000000000000000
+ modified_at: 2014-06-13 20:42:26 -0800
+ updated_at: 2014-06-13 20:42:26 -0800
+ link_class: permission
+ name: can_read
+ tail_uuid: zzzzz-tpzed-905b42d1dd4a354
+ head_uuid: zzzzz-s0uqq-382brsig8rp3666
++
+ baz_collection_name_in_asubproject:
+ uuid: zzzzz-o0j2j-bazprojectname2
+ owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: 2014-04-21 15:37:48 -0400
+ modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+ modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ modified_at: 2014-04-21 15:37:48 -0400
+ updated_at: 2014-04-21 15:37:48 -0400
+ tail_uuid: zzzzz-j7d0g-axqo7eu9pwvna1x
+ head_uuid: ea10d51bcf88862dbcc36eb292017dfd+45
+ link_class: name
+ # This should resemble the default name assigned when a
+ # Collection is added to a Project.
+ name: "ea10d51bcf88862dbcc36eb292017dfd+45 added sometime"
+ properties: {}
diff --cc services/api/test/functional/arvados/v1/groups_controller_test.rb
index c4e22f1,d7595ad..8cad840
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@@ -90,24 -90,33 +90,54 @@@ class Arvados::V1::GroupsControllerTes
check_project_contents_response
end
+ [false, true].each do |include_linked|
+ test "list objects across projects, include_linked=#{include_linked}" do
+ authorize_with :project_viewer
+ get :contents, {
+ format: :json,
+ include_linked: include_linked,
+ filters: [['uuid', 'is_a', 'arvados#specimen']]
+ }
+ assert_response :success
+ found_uuids = json_response['items'].collect { |i| i['uuid'] }
+ [[:in_aproject, true],
+ [:in_asubproject, true],
+ [:owned_by_private_group, false]].each do |specimen_fixture, should_find|
+ if should_find
+ assert_includes found_uuids, specimens(specimen_fixture).uuid, "did not find specimen fixture '#{specimen_fixture}'"
+ else
+ refute_includes found_uuids, specimens(specimen_fixture).uuid, "found specimen fixture '#{specimen_fixture}'"
+ end
++ end
++ end
++
+ test "user with project read permission can see project collections" do
+ authorize_with :project_viewer
+ get :contents, {
+ id: groups(:asubproject).uuid,
+ format: :json,
+ include_linked: true,
+ }
+ ids = json_response['items'].map { |item| item["uuid"] }
+ assert_includes ids, collections(:baz_file).uuid
+ end
+
+ test 'list objects across multiple projects' do
+ authorize_with :project_viewer
+ get :contents, {
+ format: :json,
+ include_linked: false,
+ filters: [['uuid', 'is_a', 'arvados#specimen']]
+ }
+ assert_response :success
+ found_uuids = json_response['items'].collect { |i| i['uuid'] }
+ [[:in_aproject, true],
+ [:in_asubproject, true],
+ [:owned_by_private_group, false]].each do |specimen_fixture, should_find|
+ if should_find
+ assert_includes found_uuids, specimens(specimen_fixture).uuid, "did not find specimen fixture '#{specimen_fixture}'"
+ else
+ refute_includes found_uuids, specimens(specimen_fixture).uuid, "found specimen fixture '#{specimen_fixture}'"
end
end
end
commit d579e7069ab2df27493180a36f2830ba7c10e6a6
Merge: 42d84bd b01bc9f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Aug 1 16:02:14 2014 -0400
Merge branch 'origin-3442-no-reuse-job-when-output-unreadable' refs #3442
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list