X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8048da32800fab790b68f502c52dd00c89b5b690..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 16916b7313..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
@@ -7,10 +7,11 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   # 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",
@@ -26,10 +27,77 @@ 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",
@@ -48,6 +116,7 @@ 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: "tag1",
       script_version: "master",
@@ -68,6 +137,7 @@ 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",
@@ -87,6 +157,7 @@ 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",
@@ -102,10 +173,11 @@ 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",
@@ -118,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
 
@@ -126,6 +198,7 @@ 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",
@@ -145,6 +218,7 @@ 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",
@@ -164,6 +238,7 @@ 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",
@@ -181,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