X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d8a27a40903f0dc61876947cecc9401edd3a32c..febb804129f39963722e530a394f36367220d4b5:/services/api/test/unit/job_test.rb diff --git a/services/api/test/unit/job_test.rb b/services/api/test/unit/job_test.rb index cf1e26c17f..24bc260010 100644 --- a/services/api/test/unit/job_test.rb +++ b/services/api/test/unit/job_test.rb @@ -110,24 +110,35 @@ class JobTest < ActiveSupport::TestCase assert_equal(image_uuid, job.docker_image_locator) end - test "can't create Job with Docker image locator" do + def check_attrs_unset(job, attrs) + assert_empty(attrs.each_key.map { |key| job.send(key) }.compact, + "job has values for #{attrs.keys}") + end + + def check_creation_prohibited(attrs) begin - job = Job.new job_attrs(docker_image_locator: BAD_COLLECTION) + job = Job.new(job_attrs(attrs)) rescue ActiveModel::MassAssignmentSecurity::Error # Test passes - expected attribute protection else - assert_nil job.docker_image_locator + check_attrs_unset(job, attrs) end end - test "can't assign Docker image locator to Job" do - job = Job.new job_attrs - begin - Job.docker_image_locator = BAD_COLLECTION - rescue NoMethodError - # Test passes - expected attribute protection + def check_modification_prohibited(attrs) + job = Job.new(job_attrs) + attrs.each_pair do |key, value| + assert_raises(NoMethodError) { job.send("{key}=".to_sym, value) } end - assert_nil job.docker_image_locator + check_attrs_unset(job, attrs) + end + + test "can't create Job with Docker image locator" do + check_creation_prohibited(docker_image_locator: BAD_COLLECTION) + end + + test "can't assign Docker image locator to Job" do + check_modification_prohibited(docker_image_locator: BAD_COLLECTION) end [ @@ -178,7 +189,6 @@ class JobTest < ActiveSupport::TestCase ].each do |parameters| test "verify job status #{parameters}" do job = Job.create! job_attrs - assert job.valid?, job.errors.full_messages.to_s assert_equal 'Queued', job.state, "job.state" parameters.each do |parameter| @@ -269,11 +279,9 @@ class JobTest < ActiveSupport::TestCase test "verify job queue position" do job1 = Job.create! job_attrs - assert job1.valid?, job1.errors.full_messages.to_s assert_equal 'Queued', job1.state, "Incorrect job state for newly created job1" job2 = Job.create! job_attrs - assert job2.valid?, job2.errors.full_messages.to_s assert_equal 'Queued', job2.state, "Incorrect job state for newly created job2" assert_not_nil job1.queue_position, "Expected non-nil queue position for job1" @@ -281,4 +289,115 @@ class JobTest < ActiveSupport::TestCase assert_not_equal job1.queue_position, job2.queue_position end + SDK_MASTER = "ca68b24e51992e790f29df5cc4bc54ce1da4a1c2" + SDK_TAGGED = "00634b2b8a492d6f121e3cf1d6587b821136a9a7" + + def sdk_constraint(version) + {runtime_constraints: { + "arvados_sdk_version" => version, + "docker_image" => links(:docker_image_collection_tag).name, + }} + end + + def check_job_sdk_version(expected) + job = yield + if expected.nil? + refute(job.valid?, "job valid with bad Arvados SDK version") + else + assert(job.valid?, "job not valid with good Arvados SDK version") + assert_equal(expected, job.arvados_sdk_version) + end + end + + { "master" => SDK_MASTER, + "commit2" => SDK_TAGGED, + SDK_TAGGED[0, 8] => SDK_TAGGED, + "__nonexistent__" => nil, + }.each_pair do |search, commit_hash| + test "creating job with SDK version '#{search}'" do + check_job_sdk_version(commit_hash) do + Job.new(job_attrs(sdk_constraint(search))) + end + end + + test "updating job from no SDK to version '#{search}'" do + job = Job.create!(job_attrs) + assert_nil job.arvados_sdk_version + check_job_sdk_version(commit_hash) do + job.runtime_constraints = sdk_constraint(search)[:runtime_constraints] + job + end + end + + test "updating job from SDK version 'master' to '#{search}'" do + job = Job.create!(job_attrs(sdk_constraint("master"))) + assert_equal(SDK_MASTER, job.arvados_sdk_version) + check_job_sdk_version(commit_hash) do + job.runtime_constraints = sdk_constraint(search)[:runtime_constraints] + job + end + end + end + + test "clear the SDK version" do + job = Job.create!(job_attrs(sdk_constraint("master"))) + assert_equal(SDK_MASTER, job.arvados_sdk_version) + job.runtime_constraints = {} + assert(job.valid?, "job invalid after clearing SDK version") + assert_nil(job.arvados_sdk_version) + end + + test "job with SDK constraint, without Docker image is invalid" do + sdk_attrs = sdk_constraint("master") + sdk_attrs[:runtime_constraints].delete("docker_image") + job = Job.create(job_attrs(sdk_attrs)) + refute(job.valid?, "Job valid with SDK version, without Docker image") + sdk_errors = job.errors.messages[:arvados_sdk_version] || [] + refute_empty(sdk_errors.grep(/\bDocker\b/), + "no Job SDK errors mention that Docker is required") + end + + test "invalid to clear Docker image constraint when SDK constraint exists" do + job = Job.create!(job_attrs(sdk_constraint("master"))) + job.runtime_constraints.delete("docker_image") + refute(job.valid?, + "Job with SDK constraint valid after clearing Docker image") + end + + test "can't create job with SDK version assigned directly" do + check_creation_prohibited(arvados_sdk_version: SDK_MASTER) + end + + test "can't modify job to assign SDK version directly" do + check_modification_prohibited(arvados_sdk_version: SDK_MASTER) + end + + test "job validation fails when collection uuid found in script_parameters" do + bad_params = { + script_parameters: { + 'input' => { + 'param1' => 'the collection uuid zzzzz-4zz18-012345678901234' + } + } + } + assert_raises(ActiveRecord::RecordInvalid, + "created job with a collection uuid in script_parameters") do + job = Job.create!(job_attrs(bad_params)) + end + end + + test "job validation succeeds when no collection uuid in script_parameters" do + good_params = { + script_parameters: { + 'arg1' => 'foo', + 'arg2' => [ 'bar', 'baz' ], + 'arg3' => { + 'a' => 1, + 'b' => [2, 3, 4], + } + } + } + job = Job.create!(job_attrs(good_params)) + assert job.valid? + end end