X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e932523a818a5d305ae541379b531a381f06edf4..37404e821668b6b9b1952a0a5a3b28901835884b:/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 73a676f2fd..a70c56f53a 100644 --- a/services/api/test/unit/job_test.rb +++ b/services/api/test/unit/job_test.rb @@ -25,16 +25,16 @@ class JobTest < ActiveSupport::TestCase assert_nil job.docker_image_locator end - { 'name' => [:links, :docker_image_collection_repository, :name], + { 'name' => [:links, :docker_image_collection_tag, :name], 'hash' => [:links, :docker_image_collection_hash, :name], - 'locator' => [:collections, :docker_image, :uuid], + 'locator' => [:collections, :docker_image, :portable_data_hash], }.each_pair do |spec_type, (fixture_type, fixture_name, fixture_attr)| test "Job initialized with Docker image #{spec_type} gets locator" do image_spec = send(fixture_type, fixture_name).send(fixture_attr) job = Job.new job_attrs(runtime_constraints: {'docker_image' => image_spec}) assert job.valid?, job.errors.full_messages.to_s - assert_equal(collections(:docker_image).uuid, job.docker_image_locator) + assert_equal(collections(:docker_image).portable_data_hash, job.docker_image_locator) end test "Job modified with Docker image #{spec_type} gets locator" do @@ -44,12 +44,12 @@ class JobTest < ActiveSupport::TestCase image_spec = send(fixture_type, fixture_name).send(fixture_attr) job.runtime_constraints['docker_image'] = image_spec assert job.valid?, job.errors.full_messages.to_s - assert_equal(collections(:docker_image).uuid, job.docker_image_locator) + assert_equal(collections(:docker_image).portable_data_hash, job.docker_image_locator) end end test "removing a Docker runtime constraint removes the locator" do - image_locator = collections(:docker_image).uuid + image_locator = collections(:docker_image).portable_data_hash job = Job.new job_attrs(runtime_constraints: {'docker_image' => image_locator}) assert job.valid?, job.errors.full_messages.to_s @@ -66,11 +66,11 @@ class JobTest < ActiveSupport::TestCase {'docker_image' => image_repo, 'docker_image_tag' => image_tag}) assert job.valid?, job.errors.full_messages.to_s - assert_equal(collections(:docker_image).uuid, job.docker_image_locator) + assert_equal(collections(:docker_image).portable_data_hash, job.docker_image_locator) end test "can't locate a Docker image with a nonexistent tag" do - image_repo = links(:docker_image_collection_repository).name + image_repo = links(:docker_image_collection_tag).name image_tag = '__nonexistent tag__' job = Job.new job_attrs(runtime_constraints: {'docker_image' => image_repo, @@ -83,7 +83,7 @@ class JobTest < ActiveSupport::TestCase job = Job.new job_attrs(runtime_constraints: {'docker_image' => image_hash}) assert job.valid?, job.errors.full_messages.to_s + " with partial hash #{image_hash}" - assert_equal(collections(:docker_image).uuid, job.docker_image_locator) + assert_equal(collections(:docker_image).portable_data_hash, job.docker_image_locator) end { 'name' => 'arvados_test_nonexistent', @@ -104,7 +104,7 @@ class JobTest < ActiveSupport::TestCase end test "can create Job with Docker image Collection without Docker links" do - image_uuid = collections(:unlinked_docker_image).uuid + image_uuid = collections(:unlinked_docker_image).portable_data_hash job = Job.new job_attrs(runtime_constraints: {"docker_image" => image_uuid}) assert(job.valid?, "Job created with unlinked Docker image was invalid") assert_equal(image_uuid, job.docker_image_locator) @@ -154,4 +154,57 @@ class JobTest < ActiveSupport::TestCase assert_not_empty job.errors, "validation failure did not provide errors" end end + + [ + # Each test case is of the following format + # Array of parameters where each parameter is of the format: + # attr name to be changed, attr value, and array of expectations (where each expectation is an array) + [['running', false, [['state', 'Queued']]]], + [['state', 'Running', [['started_at', 'not_nil']]]], + [['is_locked_by_uuid', 'use_current_user_uuid', [['state', 'Queued']]], ['state', 'Running', [['running', true], ['started_at', 'not_nil'], ['success', 'nil']]]], + [['running', false, [['state', 'Queued']]], ['state', 'Complete', [['success', true]]]], + [['running', true, [['state', 'Running']]], ['cancelled_at', Time.now, [['state', 'Cancelled']]]], + [['running', true, [['state', 'Running']]], ['state', 'Cancelled', [['cancelled_at', 'not_nil']]]], + [['running', true, [['state', 'Running']]], ['success', true, [['state', 'Complete']]]], + [['running', true, [['state', 'Running']]], ['success', false, [['state', 'Failed']]]], + [['running', true, [['state', 'Running']]], ['state', 'Complete', [['success', true],['finished_at', 'not_nil']]]], + [['running', true, [['state', 'Running']]], ['state', 'Failed', [['success', false],['finished_at', 'not_nil']]]], + [['running', true, [['state', 'Running']]], ['running', false, [['state', 'Queued']]]], + [['cancelled_at', Time.now, [['state', 'Cancelled']]], ['success', false, [['state', 'Cancelled'],['finished_at', 'nil'], ['cancelled_at', 'not_nil']]]], + [['cancelled_at', Time.now, [['state', 'Cancelled'],['running', false]]], ['success', true, [['state', 'Cancelled'],['running', false],['finished_at', 'nil'],['cancelled_at', 'not_nil']]]], + # potential migration cases + [['state', nil, [['state', 'Queued']]]], + [['state', nil, [['state', 'Queued']]], ['cancelled_at', Time.now, [['state', 'Cancelled']]]], + [['running', true, [['state', 'Running']]], ['state', nil, [['state', 'Running']]]], + ].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| + expectations = parameter[2] + if parameter[1] == 'use_current_user_uuid' + parameter[1] = Thread.current[:user].uuid + end + + if expectations.instance_of? Array + job[parameter[0]] = parameter[1] + assert_equal true, job.save, job.errors.full_messages.to_s + expectations.each do |expectation| + if expectation[1] == 'not_nil' + assert_not_nil job[expectation[0]], expectation[0] + elsif expectation[1] == 'nil' + assert_nil job[expectation[0]], expectation[0] + else + assert_equal expectation[1], job[expectation[0]], expectation[0] + end + end + else + raise 'I do not know how to handle this expectation' + end + end + end + end + end