X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/19ae770973482257117fe8ded5619c3018c4b60f..a1c4ece152e1e992c18f0cb368528cd2ac843b07:/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 64d559107c..d10ab6a71b 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
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 require 'test_helper'
 require 'helpers/git_test_helper'
 
@@ -13,14 +17,16 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "reuse job with no_reuse=false" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '1'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "active/foo",
+        script_parameters: {
+          an_integer: '1',
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45'
+        }
       }
     }
     assert_response :success
@@ -31,7 +37,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "reuse job with find_or_create=true" do
-    post :create, {
+    post :create, params: {
       job: {
         script: "hash",
         script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -50,8 +56,28 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
   end
 
+  test "no reuse job with null log" do
+    post :create, params: {
+      job: {
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '3'
+        }
+      },
+      find_or_create: true
+    }
+    assert_response :success
+    assert_not_nil assigns(:object)
+    new_job = JSON.parse(@response.body)
+    assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqq3', new_job['uuid']
+    assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
+  end
+
   test "reuse job with symbolic script_version" do
-    post :create, {
+    post :create, params: {
       job: {
         script: "hash",
         script_version: "tag1",
@@ -71,7 +97,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "do not reuse job because no_reuse=true" do
-    post :create, {
+    post :create, params: {
       job: {
         no_reuse: true,
         script: "hash",
@@ -92,7 +118,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
 
   [false, "false"].each do |whichfalse|
     test "do not reuse job because find_or_create=#{whichfalse.inspect}" do
-      post :create, {
+      post :create, params: {
         job: {
           script: "hash",
           script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -114,7 +140,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
 
   test "do not reuse job because output is not readable by user" do
     authorize_with :job_reader
-    post :create, {
+    post :create, params: {
       job: {
         script: "hash",
         script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -134,14 +160,16 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_no_output" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '2'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '2'
+        }
       }
     }
     assert_response :success
@@ -151,15 +179,17 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_reuse_job_range" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      minimum_script_version: "tag1",
-      script_version: "master",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '1'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        minimum_script_version: "tag1",
+        script_version: "master",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
       }
     }
     assert_response :success
@@ -170,14 +200,16 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "cannot_reuse_job_no_minimum_given_so_must_use_specified_commit" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      script_version: "master",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '1'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        script_version: "master",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
       }
     }
     assert_response :success
@@ -188,14 +220,16 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_different_input" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '2'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '2'
+        }
       }
     }
     assert_response :success
@@ -206,14 +240,16 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_different_version" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      script_version: "master",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '2'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        script_version: "master",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '2'
+        }
       }
     }
     assert_response :success
@@ -224,16 +260,18 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_can_reuse_job_submitted_nondeterministic" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '1'
-      },
-      nondeterministic: true
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        },
+        nondeterministic: true
+      }
     }
     assert_response :success
     assert_not_nil assigns(:object)
@@ -243,14 +281,16 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_past_nondeterministic" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash2",
-      script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '1'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash2",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
       }
     }
     assert_response :success
@@ -262,14 +302,16 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
 
   test "test_cannot_reuse_job_no_permission" do
     authorize_with :spectator
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
-      repository: "active/foo",
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '1'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "active/foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
       }
     }
     assert_response :success
@@ -280,16 +322,18 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_excluded" do
-    post :create, job: {
-      no_reuse: false,
-      script: "hash",
-      minimum_script_version: "31ce37fe365b3dc204300a3e4c396ad333ed0556",
-      script_version: "master",
-      repository: "active/foo",
-      exclude_script_versions: ["tag1"],
-      script_parameters: {
-        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
-        an_integer: '1'
+    post :create, params: {
+      job: {
+        no_reuse: false,
+        script: "hash",
+        minimum_script_version: "31ce37fe365b3dc204300a3e4c396ad333ed0556",
+        script_version: "master",
+        repository: "active/foo",
+        exclude_script_versions: ["tag1"],
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
       }
     }
     assert_response :success
@@ -301,7 +345,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "cannot reuse job with find_or_create but excluded version" do
-    post :create, {
+    post :create, params: {
       job: {
         script: "hash",
         script_version: "master",
@@ -343,7 +387,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   test "can reuse a Job based on filters" do
     filters_hash = BASE_FILTERS.
       merge('script_version' => ['in git', 'tag1'])
-    post(:create, {
+    post(:create, params: {
            job: {
              script: "hash",
              script_version: "master",
@@ -369,7 +413,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     filters += [["script_version", "in git",
                  "31ce37fe365b3dc204300a3e4c396ad333ed0556"],
                 ["script_version", "not in git", ["tag1"]]]
-    post(:create, {
+    post(:create, params: {
            job: {
              script: "hash",
              script_version: "master",
@@ -392,7 +436,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   test "can not reuse a Job based on arbitrary filters" do
     filters_hash = BASE_FILTERS.
       merge("created_at" => ["<", "2010-01-01T00:00:00Z"])
-    post(:create, {
+    post(:create, params: {
            job: {
              script: "hash",
              script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -413,7 +457,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "can reuse a Job with a Docker image" do
-    post(:create, {
+    post(:create, params: {
            job: {
              script: "hash",
              script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -443,7 +487,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
               ["=", "4fe459abe02d9b365932b8f5dc419439ab4e2577"],
             "docker_image_locator" =>
               ["in docker", links(:docker_image_collection_hash).name])
-    post(:create, {
+    post(:create, params: {
            job: {
              script: "hash",
              script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -471,7 +515,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
               ["=", "4fe459abe02d9b365932b8f5dc419439ab4e2577"],
             "docker_image_locator" =>
               ["in docker", links(:docker_image_collection_tag2).name])
-    post(:create, {
+    post(:create, params: {
            job: {
              script: "hash",
              script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -496,7 +540,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   test "new job with unknown Docker image filter" do
     filters_hash = BASE_FILTERS.
       merge("docker_image_locator" => ["in docker", "_nonesuchname_"])
-    post(:create, {
+    post(:create, params: {
            job: {
              script: "hash",
              script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
@@ -533,7 +577,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   ["repository", "script"].each do |skip_key|
     test "missing #{skip_key} filter raises an error" do
       filters = filters_from_hash(BASE_FILTERS.reject { |k| k == skip_key })
-      post(:create, {
+      post(:create, params: {
              job: {
                script: "hash",
                script_version: "master",
@@ -552,9 +596,11 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "find Job with script version range" do
-    get :index, filters: [["repository", "=", "active/foo"],
-                          ["script", "=", "hash"],
-                          ["script_version", "in git", "tag1"]]
+    get :index, params: {
+      filters: [["repository", "=", "active/foo"],
+                ["script", "=", "hash"],
+                ["script_version", "in git", "tag1"]]
+    }
     assert_response :success
     assert_not_nil assigns(:objects)
     assert_includes(assigns(:objects).map { |job| job.uuid },
@@ -562,9 +608,11 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "find Job with script version range exclusions" do
-    get :index, filters: [["repository", "=", "active/foo"],
-                          ["script", "=", "hash"],
-                          ["script_version", "not in git", "tag1"]]
+    get :index, params: {
+      filters: [["repository", "=", "active/foo"],
+                ["script", "=", "hash"],
+                ["script_version", "not in git", "tag1"]]
+    }
     assert_response :success
     assert_not_nil assigns(:objects)
     refute_includes(assigns(:objects).map { |job| job.uuid },
@@ -572,8 +620,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "find Job with Docker image range" do
-    get :index, filters: [["docker_image_locator", "in docker",
-                           "arvados/apitestfixture"]]
+    get :index, params: {
+      filters: [["docker_image_locator", "in docker",
+                 "arvados/apitestfixture"]]
+    }
     assert_response :success
     assert_not_nil assigns(:objects)
     assert_includes(assigns(:objects).map { |job| job.uuid },
@@ -584,7 +634,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
 
   test "find Job with Docker image using reader tokens" do
     authorize_with :inactive
-    get(:index, {
+    get(:index, params: {
           filters: [["docker_image_locator", "in docker",
                      "arvados/apitestfixture"]],
           reader_tokens: [api_token(:active)],
@@ -598,8 +648,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "'in docker' filter accepts arrays" do
-    get :index, filters: [["docker_image_locator", "in docker",
-                           ["_nonesuchname_", "arvados/apitestfixture"]]]
+    get :index, params: {
+      filters: [["docker_image_locator", "in docker",
+                ["_nonesuchname_", "arvados/apitestfixture"]]]
+    }
     assert_response :success
     assert_not_nil assigns(:objects)
     assert_includes(assigns(:objects).map { |job| job.uuid },
@@ -609,8 +661,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "'not in docker' filter accepts arrays" do
-    get :index, filters: [["docker_image_locator", "not in docker",
-                           ["_nonesuchname_", "arvados/apitestfixture"]]]
+    get :index, params: {
+      filters: [["docker_image_locator", "not in docker",
+                ["_nonesuchname_", "arvados/apitestfixture"]]]
+    }
     assert_response :success
     assert_not_nil assigns(:objects)
     assert_includes(assigns(:objects).map { |job| job.uuid },
@@ -644,7 +698,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   def create_job_from(params, start_from)
-    post(:create, create_job_params(params, start_from))
+    post(:create, params: create_job_params(params, start_from))
     assert_response :success
     new_job = assigns(:object)
     assert_not_nil new_job
@@ -664,12 +718,12 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   def check_errors_from(params, start_from=DEFAULT_START_JOB)
-    post(:create, create_job_params(params, start_from))
+    post(:create, params: create_job_params(params, start_from))
     assert_includes(405..499, @response.code.to_i)
     errors = json_response.fetch("errors", [])
     assert(errors.any?, "no errors assigned from #{params}")
     refute(errors.any? { |msg| msg =~ /^#<[A-Za-z]+: / },
-           "errors include raw exception")
+           "errors include raw exception: #{errors.inspect}")
     errors
   end
 
@@ -738,7 +792,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
             "docker_image_locator" => ["=", prev_job.docker_image_locator])
     filters_hash.delete("script_version")
     params = create_job_params(filters: filters_from_hash(filters_hash))
-    post(:create, params)
+    post(:create, params: params)
     assert_response :success
     assert_equal(prev_job.uuid, assigns(:object).uuid)
   end