X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d28b1cebc8b799ea1e65a50826602392b446ea29..6d6ee07abb8892fb1e3f606c1347d18abc321ced:/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 e1ca7c5307..e924cddfc5 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',
@@ -103,6 +103,13 @@ class JobTest < ActiveSupport::TestCase
     assert(job.invalid?, "non-Docker Collection constraint was valid")
   end
 
+  test "can create Job with Docker image Collection without Docker links" do
+    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)
+  end
+
   test "can't create Job with Docker image locator" do
     begin
       job = Job.new job_attrs(docker_image_locator: BAD_COLLECTION)
@@ -147,4 +154,60 @@ 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, (array of array of expectations OR the string "error")
+    [['running', false, [['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', false]]]],
+    [['running', true, [['state', 'Running']]], ['state', 'Cancelled', [['running', false],['cancelled_at', 'not_nil']]]],
+    [['running', true, [['state', 'Running']]], ['success', true, [['state', 'Complete'],['running', false]]]],
+    [['running', true, [['state', 'Running']]], ['success', 'false', [['state', 'Failed'],['running', false]]]],
+    [['running', true, [['state', 'Running']]], ['state', 'Complete', [['success', true],['running', false]]]],
+    [['running', true, [['state', 'Running']]], ['state', 'Failed', [['success', false],['running', false]]]],
+    # potential migration cases
+    [['state', nil, [['state', 'Queued']]]],
+    [['state', nil, [['state', 'Queued']]], ['cancelled_at', Time.now, [['state', 'Cancelled']]]],
+    [['running', true, [['state', 'Running'], ['started_at', 'not_nil']]], ['state', nil, [['state', 'Running']]]],
+    # bogus initial status (started_at but not running), to produce error while setting state
+    [['started_at', Time.now, [['state', 'Queued']]], ['state', nil, 'error']],
+  ].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 job.state, 'Queued'
+
+      parameters.each do |parameter|
+        expectations = parameter[2]
+        if expectations.instance_of? Array
+          job[parameter[0]] = parameter[1]
+          job.save!
+          expectations.each do |expectation|
+            if expectation[1] == 'not_nil'
+              assert_not_nil job[expectation[0]]
+            elsif expectation[1] == 'nil'
+              assert_nil job[expectation[0]]
+            else
+              assert_equal expectation[1], job[expectation[0]]
+            end
+          end
+        else # String expectation, looking for error
+          if expectations == 'error'
+            rescued = false
+            begin
+              job[parameter[0]] = parameter[1]
+              job.save!
+            rescue
+              rescued = true
+            end
+            assert rescued, 'Expected error'
+          end
+        end
+      end
+    end
+  end
+
 end