X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4d3a1c5346c99da360af58f1932b8f7a2ba87723..aab0fe9d849952d926a252fac1fedd7e643f5a00:/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb diff --git a/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb b/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb index 220566b536..16916b7313 100644 --- a/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb +++ b/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb @@ -2,7 +2,7 @@ require 'test_helper' load 'test/functional/arvados/v1/git_setup.rb' class Arvados::V1::JobReuseControllerTest < ActionController::TestCase - fixtures :repositories, :users, :jobs, :links + fixtures :repositories, :users, :jobs, :links, :collections # See git_setup.rb for the commit log for test.git.tar include GitSetup @@ -13,6 +13,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase post :create, job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", + repository: "foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -25,6 +26,24 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version'] end + test "test_cannot_reuse_job_no_output" do + @controller = Arvados::V1::JobsController.new + authorize_with :active + post :create, job: { + script: "hash", + script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", + repository: "foo", + script_parameters: { + input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', + an_integer: '2' + } + } + assert_response :success + assert_not_nil assigns(:object) + new_job = JSON.parse(@response.body) + assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykppp', new_job['uuid'] + end + test "test_reuse_job_range" do @controller = Arvados::V1::JobsController.new authorize_with :active @@ -32,6 +51,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase script: "hash", minimum_script_version: "tag1", script_version: "master", + repository: "foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -50,6 +70,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase post :create, job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", + repository: "foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '2' @@ -68,6 +89,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase post :create, job: { script: "hash", script_version: "master", + repository: "foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '2' @@ -86,6 +108,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase post :create, job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", + repository: "foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -105,6 +128,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase post :create, job: { script: "hash2", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", + repository: "foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -123,6 +147,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase post :create, job: { script: "hash", script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577", + repository: "foo", script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45', an_integer: '1' @@ -142,6 +167,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase script: "hash", minimum_script_version: "31ce37fe365b3dc204300a3e4c396ad333ed0556", script_version: "master", + repository: "foo", exclude_script_versions: ["tag1"], script_parameters: { input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',