Merge branch 'master' into 3642-search-for-active-only

[arvados.git] / 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 73a676f2fd3276143d5f1b2c007c5d84555c304a..730eb0634a5cc8f18373eb1b9ff219ca072bbeb2 100644 (file)
--- 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)