X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/86c192b3ae3614f69305cfd60664c9b720b84692..2c157382b1ecf0175f0356d6c3a457dca942f5f3:/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 220566b536..1cd3f2d00d 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
@@ -2,17 +2,19 @@ require 'test_helper'
 load 'test/functional/arvados/v1/git_setup.rb'
 
 class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
-  fixtures :repositories, :users, :jobs, :links
+  fixtures :repositories, :users, :jobs, :links, :collections
 
   # See git_setup.rb for the commit log for test.git.tar
   include GitSetup
 
-  test "test_reuse_job" do
+  test "reuse job with no_reuse=false" do
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
     post :create, job: {
+      no_reuse: false,
       script: "hash",
       script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+      repository: "foo",
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
         an_integer: '1'
@@ -25,13 +27,100 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
   end
 
+  test "reuse job with find_or_create=true" do
+    @controller = Arvados::V1::JobsController.new
+    authorize_with :active
+    post :create, {
+      job: {
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
+      },
+      find_or_create: true
+    }
+    assert_response :success
+    assert_not_nil assigns(:object)
+    new_job = JSON.parse(@response.body)
+    assert_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid']
+    assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
+  end
+
+  test "do not reuse job because no_reuse=true" do
+    @controller = Arvados::V1::JobsController.new
+    authorize_with :active
+    post :create, {
+      job: {
+        no_reuse: true,
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
+      }
+    }
+    assert_response :success
+    assert_not_nil assigns(:object)
+    new_job = JSON.parse(@response.body)
+    assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid']
+    assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
+  end
+
+  test "do not reuse job because find_or_create=false" do
+    @controller = Arvados::V1::JobsController.new
+    authorize_with :active
+    post :create, {
+      job: {
+        script: "hash",
+        script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+        repository: "foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
+      },
+      find_or_create: false
+    }
+    assert_response :success
+    assert_not_nil assigns(:object)
+    new_job = JSON.parse(@response.body)
+    assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid']
+    assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
+  end
+
+  test "test_cannot_reuse_job_no_output" do
+    @controller = Arvados::V1::JobsController.new
+    authorize_with :active
+    post :create, job: {
+      no_reuse: false,
+      script: "hash",
+      script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+      repository: "foo",
+      script_parameters: {
+        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+        an_integer: '2'
+      }
+    }
+    assert_response :success
+    assert_not_nil assigns(:object)
+    new_job = JSON.parse(@response.body)
+    assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykppp', new_job['uuid']
+  end
+
   test "test_reuse_job_range" do
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
     post :create, job: {
+      no_reuse: false,
       script: "hash",
       minimum_script_version: "tag1",
       script_version: "master",
+      repository: "foo",
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
         an_integer: '1'
@@ -48,8 +137,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
     post :create, job: {
+      no_reuse: false,
       script: "hash",
       script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+      repository: "foo",
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
         an_integer: '2'
@@ -66,8 +157,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
     post :create, job: {
+      no_reuse: false,
       script: "hash",
       script_version: "master",
+      repository: "foo",
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
         an_integer: '2'
@@ -80,12 +173,14 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     assert_equal '077ba2ad3ea24a929091a9e6ce545c93199b8e57', new_job['script_version']
   end
 
-  test "test_cannot_reuse_job_submitted_nondeterministic" do
+  test "test_can_reuse_job_submitted_nondeterministic" do
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
     post :create, job: {
+      no_reuse: false,
       script: "hash",
       script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+      repository: "foo",
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
         an_integer: '1'
@@ -95,7 +190,7 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     assert_response :success
     assert_not_nil assigns(:object)
     new_job = JSON.parse(@response.body)
-    assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid']
+    assert_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid']
     assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
   end
 
@@ -103,8 +198,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
     post :create, job: {
+      no_reuse: false,
       script: "hash2",
       script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+      repository: "foo",
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
         an_integer: '1'
@@ -121,8 +218,10 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     @controller = Arvados::V1::JobsController.new
     authorize_with :spectator
     post :create, job: {
+      no_reuse: false,
       script: "hash",
       script_version: "4fe459abe02d9b365932b8f5dc419439ab4e2577",
+      repository: "foo",
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
         an_integer: '1'
@@ -139,9 +238,11 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
     post :create, job: {
+      no_reuse: false,
       script: "hash",
       minimum_script_version: "31ce37fe365b3dc204300a3e4c396ad333ed0556",
       script_version: "master",
+      repository: "foo",
       exclude_script_versions: ["tag1"],
       script_parameters: {
         input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
@@ -155,5 +256,28 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     assert_equal '077ba2ad3ea24a929091a9e6ce545c93199b8e57', new_job['script_version']
   end
 
+  test "cannot reuse job with find_or_create but excluded version" do
+    @controller = Arvados::V1::JobsController.new
+    authorize_with :active
+    post :create, {
+      job: {
+        script: "hash",
+        script_version: "master",
+        repository: "foo",
+        script_parameters: {
+          input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+          an_integer: '1'
+        }
+      },
+      find_or_create: true,
+      minimum_script_version: "31ce37fe365b3dc204300a3e4c396ad333ed0556",
+      exclude_script_versions: ["tag1"],
+    }
+    assert_response :success
+    assert_not_nil assigns(:object)
+    new_job = JSON.parse(@response.body)
+    assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid']
+    assert_equal '077ba2ad3ea24a929091a9e6ce545c93199b8e57', new_job['script_version']
+  end
 
 end