[ARVADOS] updated: 1.3.0-1472-g021f8eb81

Git user git at public.curoverse.com
Fri Aug 9 19:02:23 UTC 2019


Summary of changes:
 services/api/app/models/job.rb                   |  10 +
 services/api/app/models/job_task.rb              |  10 +
 services/api/app/models/pipeline_instance.rb     |  10 +
 services/api/app/models/pipeline_template.rb     |  11 +
 services/api/test/unit/job_task_test.rb          |  11 -
 services/api/test/unit/job_test.rb               | 344 -----------------------
 services/api/test/unit/pipeline_instance_test.rb | 106 -------
 7 files changed, 41 insertions(+), 461 deletions(-)

       via  021f8eb819919d4606d7b4c72a2497e842041526 (commit)
      from  751745e032831e16c5b67cd4bd0d328cd1f11fd7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 021f8eb819919d4606d7b4c72a2497e842041526
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Aug 9 15:01:28 2019 -0400

    15133: Disallow creating/updating jobs API records in model
    
    Remove a bunch more tests.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 799484b24..37e5f455d 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -47,6 +47,8 @@ class Job < ArvadosModel
   validate :ensure_no_collection_uuids_in_script_params
   before_save :tag_version_in_internal_repository
   before_save :update_timestamps_when_state_changes
+  before_create :create_disabled
+  before_update :update_disabled
 
   has_many(:nodes, foreign_key: :job_uuid, primary_key: :uuid)
 
@@ -551,4 +553,12 @@ class Job < ArvadosModel
     end
     false
   end
+
+  def create_disabled
+    raise "Disabled"
+  end
+
+  def update_disabled
+    raise "Disabled"
+  end
 end
diff --git a/services/api/app/models/job_task.rb b/services/api/app/models/job_task.rb
index a96018650..b181e76cc 100644
--- a/services/api/app/models/job_task.rb
+++ b/services/api/app/models/job_task.rb
@@ -9,6 +9,8 @@ class JobTask < ArvadosModel
   serialize :parameters, Hash
   before_create :set_default_qsequence
   after_update :delete_created_job_tasks_if_failed
+  before_create :create_disabled
+  before_update :update_disabled
 
   api_accessible :user, extend: :common do |t|
     t.add :job_uuid
@@ -35,4 +37,12 @@ class JobTask < ArvadosModel
     self.qsequence ||= self.class.connection.
       select_value("SELECT nextval('job_tasks_qsequence_seq')")
   end
+
+  def create_disabled
+    raise "Disabled"
+  end
+
+  def update_disabled
+    raise "Disabled"
+  end
 end
diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb
index 23579ff13..271b155aa 100644
--- a/services/api/app/models/pipeline_instance.rb
+++ b/services/api/app/models/pipeline_instance.rb
@@ -17,6 +17,8 @@ class PipelineInstance < ArvadosModel
   before_validation :update_timestamps_when_state_changes
   before_create :set_state_before_save
   before_save :set_state_before_save
+  before_create :create_disabled
+  before_update :update_disabled
 
   api_accessible :user, extend: :common do |t|
     t.add :pipeline_template_uuid
@@ -160,4 +162,12 @@ class PipelineInstance < ArvadosModel
     end
   end
 
+
+  def create_disabled
+    raise "Disabled"
+  end
+
+  def update_disabled
+    raise "Disabled"
+  end
 end
diff --git a/services/api/app/models/pipeline_template.rb b/services/api/app/models/pipeline_template.rb
index b19a2b0f7..7c694698e 100644
--- a/services/api/app/models/pipeline_template.rb
+++ b/services/api/app/models/pipeline_template.rb
@@ -3,6 +3,9 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 class PipelineTemplate < ArvadosModel
+  before_create :create_disabled
+  before_update :update_disabled
+
   include HasUuid
   include KindAndEtag
   include CommonApiTemplate
@@ -17,4 +20,12 @@ class PipelineTemplate < ArvadosModel
   def self.limit_index_columns_read
     ["components"]
   end
+
+  def create_disabled
+    raise "Disabled"
+  end
+
+  def update_disabled
+    raise "Disabled"
+  end
 end
diff --git a/services/api/test/unit/job_task_test.rb b/services/api/test/unit/job_task_test.rb
index 05a5d21a2..36a0e723f 100644
--- a/services/api/test/unit/job_task_test.rb
+++ b/services/api/test/unit/job_task_test.rb
@@ -5,16 +5,5 @@
 require 'test_helper'
 
 class JobTaskTest < ActiveSupport::TestCase
-  test "new tasks get an assigned qsequence" do
-    set_user_from_auth :active
-    task = JobTask.create
-    assert_not_nil task.qsequence
-    assert_operator(task.qsequence, :>=, 0)
-  end
 
-  test "assigned qsequence is not overwritten" do
-    set_user_from_auth :active
-    task = JobTask.create!(qsequence: 99)
-    assert_equal(99, task.qsequence)
-  end
 end
diff --git a/services/api/test/unit/job_test.rb b/services/api/test/unit/job_test.rb
index b20120635..0e8cc4853 100644
--- a/services/api/test/unit/job_test.rb
+++ b/services/api/test/unit/job_test.rb
@@ -104,16 +104,6 @@ class JobTest < ActiveSupport::TestCase
     end
   end
 
-  test "create a job with a disambiguated script_version branch name" do
-    job = Job.
-      new(script: "testscript",
-          script_version: "heads/7387838c69a21827834586cc42b467ff6c63293b",
-          repository: "active/shabranchnames",
-          script_parameters: {})
-    assert(job.save)
-    assert_equal("abec49829bf1758413509b7ffcab32a771b71e81", job.script_version)
-  end
-
   test "locate a Docker image with a partial hash" do
     image_hash = links(:docker_image_collection_hash).name[0..24]
     job = Job.new job_attrs(runtime_constraints:
@@ -178,178 +168,6 @@ class JobTest < ActiveSupport::TestCase
     check_modification_prohibited(docker_image_locator: BAD_COLLECTION)
   end
 
-  [
-   {script_parameters: ""},
-   {script_parameters: []},
-   {script_parameters: {["foo"] => ["bar"]}},
-   {runtime_constraints: ""},
-   {runtime_constraints: []},
-   {tasks_summary: ""},
-   {tasks_summary: []},
-  ].each do |invalid_attrs|
-    test "validation failures set error messages: #{invalid_attrs.to_json}" do
-      # Ensure valid_attrs doesn't produce errors -- otherwise we will
-      # not know whether errors reported below are actually caused by
-      # invalid_attrs.
-      Job.new(job_attrs).save!
-
-      err = assert_raises(ArgumentError) do
-        Job.new(job_attrs(invalid_attrs)).save!
-      end
-      assert_match /parameters|constraints|summary/, err.message
-    end
-  end
-
-  test "invalid script_version" do
-    invalid = {
-      script_version: "no/branch/could/ever/possibly/have/this/name",
-    }
-    err = assert_raises(ActiveRecord::RecordInvalid) do
-      Job.new(job_attrs(invalid)).save!
-    end
-    assert_match /Script version .* does not resolve to a commit/, err.message
-  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, and array of expectations (where each expectation is an array)
-    [['running', false, [['state', 'Queued']]]],
-    [['state', 'Running', [['started_at', 'not_nil']]]],
-    [['is_locked_by_uuid', 'use_current_user_uuid', [['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', true, [['state', 'Running']]], ['state', 'Cancelled', [['cancelled_at', 'not_nil']]]],
-    [['running', true, [['state', 'Running']]], ['success', true, [['state', 'Complete']]]],
-    [['running', true, [['state', 'Running']]], ['success', false, [['state', 'Failed']]]],
-    [['running', true, [['state', 'Running']]], ['state', 'Complete', [['success', true],['finished_at', 'not_nil']]]],
-    [['running', true, [['state', 'Running']]], ['state', 'Failed', [['success', false],['finished_at', 'not_nil']]]],
-    [['cancelled_at', Time.now, [['state', 'Cancelled']]], ['success', false, [['state', 'Cancelled'],['finished_at', 'nil'], ['cancelled_at', 'not_nil']]]],
-    [['cancelled_at', Time.now, [['state', 'Cancelled'],['running', false]]], ['success', true, [['state', 'Cancelled'],['running', false],['finished_at', 'nil'],['cancelled_at', 'not_nil']]]],
-    # potential migration cases
-    [['state', nil, [['state', 'Queued']]]],
-    [['state', nil, [['state', 'Queued']]], ['cancelled_at', Time.now, [['state', 'Cancelled']]]],
-    [['running', true, [['state', 'Running']]], ['state', nil, [['state', 'Running']]]],
-  ].each do |parameters|
-    test "verify job status #{parameters}" do
-      job = Job.create! job_attrs
-      assert_equal 'Queued', job.state, "job.state"
-
-      parameters.each do |parameter|
-        expectations = parameter[2]
-        if 'use_current_user_uuid' == parameter[1]
-          parameter[1] = Thread.current[:user].uuid
-        end
-
-        if expectations.instance_of? Array
-          job[parameter[0]] = parameter[1]
-          assert_equal true, job.save, job.errors.full_messages.to_s
-          expectations.each do |expectation|
-            if expectation[1] == 'not_nil'
-              assert_not_nil job[expectation[0]], expectation[0]
-            elsif expectation[1] == 'nil'
-              assert_nil job[expectation[0]], expectation[0]
-            else
-              assert_equal expectation[1], job[expectation[0]], expectation[0]
-            end
-          end
-        else
-          raise 'I do not know how to handle this expectation'
-        end
-      end
-    end
-  end
-
-  test "Test job state changes" do
-    all = ["Queued", "Running", "Complete", "Failed", "Cancelled"]
-    valid = {"Queued" => all, "Running" => ["Complete", "Failed", "Cancelled"]}
-    all.each do |start|
-      all.each do |finish|
-        if start != finish
-          job = Job.create! job_attrs(state: start)
-          assert_equal start, job.state
-          job.state = finish
-          job.save
-          job.reload
-          if valid[start] and valid[start].include? finish
-            assert_equal finish, job.state
-          else
-            assert_equal start, job.state
-          end
-        end
-      end
-    end
-  end
-
-  test "Test job locking" do
-    set_user_from_auth :active_trustedclient
-    job = Job.create! job_attrs
-
-    assert_equal "Queued", job.state
-
-    # Should be able to lock successfully
-    job.lock current_user.uuid
-    assert_equal "Running", job.state
-
-    assert_raises ArvadosModel::AlreadyLockedError do
-      # Can't lock it again
-      job.lock current_user.uuid
-    end
-    job.reload
-    assert_equal "Running", job.state
-
-    set_user_from_auth :project_viewer
-    assert_raises ArvadosModel::AlreadyLockedError do
-      # Can't lock it as a different user either
-      job.lock current_user.uuid
-    end
-    job.reload
-    assert_equal "Running", job.state
-
-    assert_raises ArvadosModel::PermissionDeniedError do
-      # Can't update fields as a different user
-      job.update_attributes(state: "Failed")
-    end
-    job.reload
-    assert_equal "Running", job.state
-
-
-    set_user_from_auth :active_trustedclient
-
-    # Can update fields as the locked_by user
-    job.update_attributes(state: "Failed")
-    assert_equal "Failed", job.state
-  end
-
-  test "admin user can cancel a running job despite lock" do
-    set_user_from_auth :active_trustedclient
-    job = Job.create! job_attrs
-    job.lock current_user.uuid
-    assert_equal Job::Running, job.state
-
-    set_user_from_auth :spectator
-    assert_raises do
-      job.update_attributes!(state: Job::Cancelled)
-    end
-
-    set_user_from_auth :admin
-    job.reload
-    assert_equal Job::Running, job.state
-    job.update_attributes!(state: Job::Cancelled)
-    assert_equal Job::Cancelled, job.state
-  end
-
-  test "verify job queue position" do
-    job1 = Job.create! job_attrs
-    assert_equal 'Queued', job1.state, "Incorrect job state for newly created job1"
-
-    job2 = Job.create! job_attrs
-    assert_equal 'Queued', job2.state, "Incorrect job state for newly created job2"
-
-    assert_not_nil job1.queue_position, "Expected non-nil queue position for job1"
-    assert_not_nil job2.queue_position, "Expected non-nil queue position for job2"
-  end
-
   SDK_MASTER = "ca68b24e51992e790f29df5cc4bc54ce1da4a1c2"
   SDK_TAGGED = "00634b2b8a492d6f121e3cf1d6587b821136a9a7"
 
@@ -370,128 +188,6 @@ class JobTest < ActiveSupport::TestCase
     end
   end
 
-  { "master" => SDK_MASTER,
-    "commit2" => SDK_TAGGED,
-    SDK_TAGGED[0, 8] => SDK_TAGGED,
-    "__nonexistent__" => nil,
-  }.each_pair do |search, commit_hash|
-    test "creating job with SDK version '#{search}'" do
-      check_job_sdk_version(commit_hash) do
-        Job.new(job_attrs(sdk_constraint(search)))
-      end
-    end
-
-    test "updating job from no SDK to version '#{search}'" do
-      job = Job.create!(job_attrs)
-      assert_nil job.arvados_sdk_version
-      check_job_sdk_version(commit_hash) do
-        job.runtime_constraints = sdk_constraint(search)[:runtime_constraints]
-        job
-      end
-    end
-
-    test "updating job from SDK version 'master' to '#{search}'" do
-      job = Job.create!(job_attrs(sdk_constraint("master")))
-      assert_equal(SDK_MASTER, job.arvados_sdk_version)
-      check_job_sdk_version(commit_hash) do
-        job.runtime_constraints = sdk_constraint(search)[:runtime_constraints]
-        job
-      end
-    end
-  end
-
-  test "clear the SDK version" do
-    job = Job.create!(job_attrs(sdk_constraint("master")))
-    assert_equal(SDK_MASTER, job.arvados_sdk_version)
-    job.runtime_constraints = {}
-    assert(job.valid?, "job invalid after clearing SDK version")
-    assert_nil(job.arvados_sdk_version)
-  end
-
-  test "job with SDK constraint, without Docker image is invalid" do
-    sdk_attrs = sdk_constraint("master")
-    sdk_attrs[:runtime_constraints].delete("docker_image")
-    job = Job.create(job_attrs(sdk_attrs))
-    refute(job.valid?, "Job valid with SDK version, without Docker image")
-    sdk_errors = job.errors.messages[:arvados_sdk_version] || []
-    refute_empty(sdk_errors.grep(/\bDocker\b/),
-                 "no Job SDK errors mention that Docker is required")
-  end
-
-  test "invalid to clear Docker image constraint when SDK constraint exists" do
-    job = Job.create!(job_attrs(sdk_constraint("master")))
-    job.runtime_constraints.delete("docker_image")
-    refute(job.valid?,
-           "Job with SDK constraint valid after clearing Docker image")
-  end
-
-  test "use migrated docker image if requesting old-format image by tag" do
-    Rails.configuration.Containers.SupportedDockerImageFormats = {'v2'=>{}}
-    add_docker19_migration_link
-    job = Job.create!(
-      job_attrs(
-        script: 'foo',
-        runtime_constraints: {
-          'docker_image' => links(:docker_image_collection_tag).name}))
-    assert(job.valid?)
-    assert_equal(job.docker_image_locator, collections(:docker_image_1_12).portable_data_hash)
-  end
-
-  test "use migrated docker image if requesting old-format image by pdh" do
-    Rails.configuration.Containers.SupportedDockerImageFormats = {'v2'=>{}}
-    add_docker19_migration_link
-    job = Job.create!(
-      job_attrs(
-        script: 'foo',
-        runtime_constraints: {
-          'docker_image' => collections(:docker_image).portable_data_hash}))
-    assert(job.valid?)
-    assert_equal(job.docker_image_locator, collections(:docker_image_1_12).portable_data_hash)
-  end
-
-  [[:docker_image, :docker_image, :docker_image_1_12],
-   [:docker_image_1_12, :docker_image, :docker_image_1_12],
-   [:docker_image, :docker_image_1_12, :docker_image_1_12],
-   [:docker_image_1_12, :docker_image_1_12, :docker_image_1_12],
-  ].each do |existing_image, request_image, expect_image|
-    test "if a #{existing_image} job exists, #{request_image} yields #{expect_image} after migration" do
-      Rails.configuration.Containers.SupportedDockerImageFormats = {'v1'=>{}}
-
-      if existing_image == :docker_image
-        oldjob = Job.create!(
-          job_attrs(
-            script: 'foobar1',
-            runtime_constraints: {
-              'docker_image' => collections(existing_image).portable_data_hash}))
-        oldjob.reload
-        assert_equal(oldjob.docker_image_locator,
-                     collections(existing_image).portable_data_hash)
-      elsif existing_image == :docker_image_1_12
-        assert_raises(ActiveRecord::RecordInvalid,
-                      "Should not resolve v2 image when only v1 is supported") do
-        oldjob = Job.create!(
-          job_attrs(
-            script: 'foobar1',
-            runtime_constraints: {
-              'docker_image' => collections(existing_image).portable_data_hash}))
-        end
-      end
-
-      Rails.configuration.Containers.SupportedDockerImageFormats = {'v2'=>{}}
-      add_docker19_migration_link
-
-      # Check that both v1 and v2 images get resolved to v2.
-      newjob = Job.create!(
-        job_attrs(
-          script: 'foobar1',
-          runtime_constraints: {
-            'docker_image' => collections(request_image).portable_data_hash}))
-      newjob.reload
-      assert_equal(newjob.docker_image_locator,
-                   collections(expect_image).portable_data_hash)
-    end
-  end
-
   test "can't create job with SDK version assigned directly" do
     check_creation_prohibited(arvados_sdk_version: SDK_MASTER)
   end
@@ -500,46 +196,6 @@ class JobTest < ActiveSupport::TestCase
     check_modification_prohibited(arvados_sdk_version: SDK_MASTER)
   end
 
-  test "job validation fails when collection uuid found in script_parameters" do
-    bad_params = {
-      script_parameters: {
-        'input' => {
-          'param1' => 'the collection uuid zzzzz-4zz18-012345678901234'
-        }
-      }
-    }
-    assert_raises(ActiveRecord::RecordInvalid,
-                  "created job with a collection uuid in script_parameters") do
-      Job.create!(job_attrs(bad_params))
-    end
-  end
-
-  test "job validation succeeds when no collection uuid in script_parameters" do
-    good_params = {
-      script_parameters: {
-        'arg1' => 'foo',
-        'arg2' => [ 'bar', 'baz' ],
-        'arg3' => {
-          'a' => 1,
-          'b' => [2, 3, 4],
-        }
-      }
-    }
-    job = Job.create!(job_attrs(good_params))
-    assert job.valid?
-  end
-
-  test 'update job uuid tag in internal.git when version changes' do
-    authorize_with :active
-    j = jobs :queued
-    j.update_attributes repository: 'active/foo', script_version: 'b1'
-    assert_equal('1de84a854e2b440dc53bf42f8548afa4c17da332',
-                 internal_tag(j.uuid))
-    j.update_attributes repository: 'active/foo', script_version: 'master'
-    assert_equal('077ba2ad3ea24a929091a9e6ce545c93199b8e57',
-                 internal_tag(j.uuid))
-  end
-
   test 'script_parameters_digest is independent of key order' do
     j1 = Job.new(job_attrs(script_parameters: {'a' => 'a', 'ddee' => {'d' => 'd', 'e' => 'e'}}))
     j2 = Job.new(job_attrs(script_parameters: {'ddee' => {'e' => 'e', 'd' => 'd'}, 'a' => 'a'}))
diff --git a/services/api/test/unit/pipeline_instance_test.rb b/services/api/test/unit/pipeline_instance_test.rb
index 8197deee0..614c169e8 100644
--- a/services/api/test/unit/pipeline_instance_test.rb
+++ b/services/api/test/unit/pipeline_instance_test.rb
@@ -6,112 +6,6 @@ require 'test_helper'
 
 class PipelineInstanceTest < ActiveSupport::TestCase
 
-  test "check active and success for a pipeline in new state" do
-    pi = pipeline_instances :new_pipeline
-
-    assert_equal 'New', pi.state, 'expected state to be New for :new_pipeline'
-
-    # save the pipeline and expect state to be New
-    Thread.current[:user] = users(:admin)
-
-    pi.save
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::New, pi.state, 'expected state to be New for new pipeline'
-  end
-
-  test "check active and success for a newly created pipeline" do
-    set_user_from_auth :active
-
-    pi = PipelineInstance.create(state: 'Ready')
-    pi.save
-
-    assert pi.valid?, 'expected newly created empty pipeline to be valid ' + pi.errors.messages.to_s
-    assert_equal 'Ready', pi.state, 'expected state to be Ready for a new empty pipeline'
-  end
-
-  test "update attributes for pipeline" do
-    Thread.current[:user] = users(:admin)
-
-    pi = pipeline_instances :new_pipeline
-
-    # add a component with no input and expect state to be New
-    component = {'script_parameters' => {"input_not_provided" => {"required" => true}}}
-    pi.components['first'] = component
-    components = pi.components
-    pi.update_attribute 'components', pi.components
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::New, pi.state, 'expected state to be New after adding component with input'
-    assert_equal pi.components.size, 1, 'expected one component'
-    assert_nil pi.started_at, 'expected started_at to be nil on new pipeline instance'
-    assert_nil pi.finished_at, 'expected finished_at to be nil on new pipeline instance'
-
-    # add a component with no input not required
-    component = {'script_parameters' => {"input_not_provided" => {"required" => false}}}
-    pi.components['first'] = component
-    components = pi.components
-    pi.update_attribute 'components', pi.components
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::Ready, pi.state, 'expected state to be Ready after adding component with input'
-    assert_equal pi.components.size, 1, 'expected one component'
-
-    # add a component with input and expect state to become Ready
-    component = {'script_parameters' => {"input" => "yyyad4b39ca5a924e481008009d94e32+210"}}
-    pi.components['first'] = component
-    components = pi.components
-    pi.update_attribute 'components', pi.components
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::Ready, pi.state, 'expected state to be Ready after adding component with input'
-    assert_equal pi.components.size, 1, 'expected one component'
-
-    pi.state = PipelineInstance::RunningOnServer
-    pi.save
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::RunningOnServer, pi.state, 'expected state to be RunningOnServer after updating state to RunningOnServer'
-    assert_not_nil pi.started_at, 'expected started_at to have a value on a running pipeline instance'
-    assert_nil pi.finished_at, 'expected finished_at to be nil on a running pipeline instance'
-
-    pi.state = PipelineInstance::Paused
-    pi.save
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::Paused, pi.state, 'expected state to be Paused after updating state to Paused'
-
-    pi.state = PipelineInstance::Complete
-    pi.save
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::Complete, pi.state, 'expected state to be Complete after updating state to Complete'
-    assert_not_nil pi.started_at, 'expected started_at to have a value on a completed pipeline instance'
-    assert_not_nil pi.finished_at, 'expected finished_at to have a value on a completed pipeline instance'
-
-    pi.state = 'bogus'
-    pi.save
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::Complete, pi.state, 'expected state to be unchanged with set to a bogus value'
-
-    pi.state = PipelineInstance::Failed
-    pi.save
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::Failed, pi.state, 'expected state to be Failed after updating state to Failed'
-    assert_not_nil pi.started_at, 'expected started_at to have a value on a failed pipeline instance'
-    assert_not_nil pi.finished_at, 'expected finished_at to have a value on a failed pipeline instance'
-  end
-
-  test "update attributes for pipeline with two components" do
-    pi = pipeline_instances :new_pipeline
-
-    # add two components, one with input and one with no input and expect state to be New
-    component1 = {'script_parameters' => {"something" => "xxxad4b39ca5a924e481008009d94e32+210", "input" => "c1bad4b39ca5a924e481008009d94e32+210"}}
-    component2 = {'script_parameters' => {"something_else" => "xxxad4b39ca5a924e481008009d94e32+210", "input_missing" => {"required" => true}}}
-    pi.components['first'] = component1
-    pi.components['second'] = component2
-
-    Thread.current[:user] = users(:admin)
-    pi.update_attribute 'components', pi.components
-
-    pi = PipelineInstance.find_by_uuid 'zzzzz-d1hrv-f4gneyn6br1xize'
-    assert_equal PipelineInstance::New, pi.state, 'expected state to be New after adding component with input'
-    assert_equal pi.components.size, 2, 'expected two components'
-  end
-
   [:has_component_with_no_script_parameters,
    :has_component_with_empty_script_parameters].each do |pi_name|
     test "update pipeline that #{pi_name}" do

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list