[ARVADOS] updated: 4743b2e8f9587146f24359f98b648e92d5b04e38
Git user
git at public.curoverse.com
Tue Mar 29 13:26:58 EDT 2016
Summary of changes:
.../pipeline_instances/_running_component.html.erb | 10 ----
apps/workbench/test/test_helper.rb | 6 +-
build/run-build-packages-one-target.sh | 4 +-
build/run-build-packages.sh | 26 +++++----
.../v1/api_client_authorizations_controller.rb | 33 ++++++++---
.../app/controllers/arvados/v1/jobs_controller.rb | 4 +-
services/api/app/models/job.rb | 13 +++--
services/api/test/fixtures/jobs.yml | 2 +-
.../api_client_authorizations_controller_test.rb | 40 ++++++++++---
.../arvados/v1/groups_controller_test.rb | 6 +-
.../functional/arvados/v1/jobs_controller_test.rb | 66 ++++++++++++++++------
services/api/test/test_helper.rb | 6 +-
services/api/test/unit/job_test.rb | 1 -
services/keepstore/azure_blob_volume.go | 2 +-
14 files changed, 142 insertions(+), 77 deletions(-)
via 4743b2e8f9587146f24359f98b648e92d5b04e38 (commit)
via 98036435a54261258faadedeef0675eecfe4ff39 (commit)
via f2f5c6aa8117b51e9fed1a59a41b97b18ac713a8 (commit)
via 0e32c4ee6281dd4a3ae186b75dd7c94c8be508c8 (commit)
via adad241671bd37f76b5dcefad1e01914f9797214 (commit)
via 087ad4d01176703f22fde4cf053427e562890c16 (commit)
via 6c01579495dd6a26ee9b05aa0accd136094d453e (commit)
via a810fa495eab5bc3356ac53a9a3aa40d69b1c77e (commit)
via 32fba9fa61361bf068e8125507e6242da4295ee5 (commit)
via abd7a5952a3e852c854e3e08353b42b778a7381d (commit)
via 91b6e4f4ae93850fb3cc38cf8566115a66f44b27 (commit)
via 48fce933fec998722e669d7d33a62f3c0a10b05e (commit)
from 7a6612d56b719165d3aff84754521c9a38d9912a (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 4743b2e8f9587146f24359f98b648e92d5b04e38
Author: radhika <radhika at curoverse.com>
Date: Tue Mar 29 13:10:49 2016 -0400
8703: better organized tests
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 41592af..78ef2d2 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -233,12 +233,12 @@ end
class ActionController::TestCase
setup do
- @counter = 0
+ @test_counter = 0
end
def check_counter action
- @counter += 1
- if @counter == 2
+ @test_counter += 1
+ if @test_counter == 2
assert_equal 1, 2, "Multiple actions in controller test"
end
end
diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml
index ed79097..13fe1ab 100644
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -516,7 +516,7 @@ running_job_with_components:
output: ~
priority: 0
log: ~
- is_locked_by_uuid: zzzzz-tpzed-d9tiejq69daie8f
+ is_locked_by_uuid: zzzzz-tpzed-xurymjxw79nv3jz
tasks_summary:
failed: 0
todo: 3
diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index 6623c72..0084679 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -389,7 +389,7 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
assert_response :success
# verify that the user can no longer see the project
- @counter = 0 # Reset executed action counter
+ @test_counter = 0 # Reset executed action counter
@controller = Arvados::V1::GroupsController.new
authorize_with :project_viewer
get :index, filters: [['group_class', '=', 'project']], format: :json
@@ -401,7 +401,7 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
assert_equal false, found_projects.include?(groups(:starred_and_shared_active_user_project).uuid)
# share the project
- @counter = 0
+ @test_counter = 0
@controller = Arvados::V1::LinksController.new
authorize_with :system_user
post :create, link: {
@@ -412,7 +412,7 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
}
# verify that project_viewer user can now see shared project again
- @counter = 0
+ @test_counter = 0
@controller = Arvados::V1::GroupsController.new
authorize_with :project_viewer
get :index, filters: [['group_class', '=', 'project']], format: :json
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 f68e50c..601f9a7 100644
--- a/services/api/test/functional/arvados/v1/jobs_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
@@ -442,19 +442,57 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
assert_equal ["component1", "component2"], json_response["components"].keys
end
- test 'update job with components with no lock' do
+ [
+ [:active, :success],
+ [:system_user, :success],
+ [:admin, 403],
+ ].each do |user, expected|
+ test "add components to job locked by active user as #{user} user and expect #{expected}" do
+ authorize_with user
+ put :update, {
+ id: jobs(:running).uuid,
+ job: {
+ components: {"component1" => "value1", "component2" => "value2"}
+ }
+ }
+ assert_response expected
+ if expected == :success
+ assert_not_nil json_response["components"]
+ keys = json_response["components"].keys
+ assert_equal ["component1", "component2"], keys
+ assert_equal "value1", json_response["components"][keys[0]]
+ end
+ end
+ end
+
+ test 'get_delete components_get again for job with components' do
authorize_with :active
+ get :show, {id: jobs(:running_job_with_components).uuid}
+ assert_response :success
+ assert_not_nil json_response["components"]
+ assert_equal ["component1", "component2"], json_response["components"].keys
+
+ # delete second component
+ @test_counter = 0 # Reset executed action counter
+ @controller = Arvados::V1::JobsController.new
put :update, {
id: jobs(:running_job_with_components).uuid,
job: {
- components: {}
+ components: {"component1" => "zzzzz-8i9sb-jobuuid00000001"}
}
}
- assert_response 403
- end
+ assert_response :success
- test 'update job with components' do
- authorize_with :admin
+ @test_counter = 0 # Reset executed action counter
+ @controller = Arvados::V1::JobsController.new
+ get :show, {id: jobs(:running_job_with_components).uuid}
+ assert_response :success
+ assert_not_nil json_response["components"]
+ assert_equal ["component1"], json_response["components"].keys
+
+ # delete all components
+ @test_counter = 0 # Reset executed action counter
+ @controller = Arvados::V1::JobsController.new
put :update, {
id: jobs(:running_job_with_components).uuid,
job: {
@@ -462,20 +500,12 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
}
}
assert_response :success
- end
- test 'add components to job locked by active user as system user' do
- authorize_with :system_user
- put :update, {
- id: jobs(:running).uuid,
- job: {
- components: {"component1" => "value1", "component2" => "value2"}
- }
- }
+ @test_counter = 0 # Reset executed action counter
+ @controller = Arvados::V1::JobsController.new
+ get :show, {id: jobs(:running_job_with_components).uuid}
assert_response :success
assert_not_nil json_response["components"]
- keys = json_response["components"].keys
- assert_equal ["component1", "component2"], keys
- assert_equal "value1", json_response["components"][keys[0]]
+ assert_equal [], json_response["components"].keys
end
end
diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index 68d4bbf..7579abf 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -106,12 +106,12 @@ end
class ActionController::TestCase
setup do
- @counter = 0
+ @test_counter = 0
end
def check_counter action
- @counter += 1
- if @counter == 2
+ @test_counter += 1
+ if @test_counter == 2
assert_equal 1, 2, "Multiple actions in functional test"
end
end
commit 98036435a54261258faadedeef0675eecfe4ff39
Merge: 7a6612d f2f5c6a
Author: radhika <radhika at curoverse.com>
Date: Tue Mar 29 11:54:01 2016 -0400
Merge branch 'master' into 8703-job-components
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list