Merge branch '12840-cancelled-pipeline'

fixes #12840

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined apps/workbench/test/unit/work_unit_test.rb
index 9f660cd34434cb9cacf8a19774b4ce9522e57129,c5a6d8f4775f2e908653a1444e9954ce8014d796..1daf582553bf5ce0283e2cd4dfc0550753ca846e
--- 1/apps/workbench/test/unit/work_unit_test.rb
--- 2/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@@ -17,11 -17,12 +17,12 @@@ class WorkUnitTest < ActiveSupport::Tes
      [PipelineInstance, 'pipeline_in_running_state', nil, 1, "Running", nil, 0.0],
      [PipelineInstance, 'has_component_with_completed_jobs', nil, 3, "Complete", true, 1.0],
      [PipelineInstance, 'pipeline_with_tagged_collection_input', "pwu", 1, "Ready", nil, 0.0],
+     [PipelineInstance, 'failed_pipeline_with_two_jobs', nil, 2, "Cancelled", false, 0.0],
      [Container, 'requester', 'cwu', 1, "Complete", true, 1.0],
      [ContainerRequest, 'cr_for_requester', 'cwu', 1, "Complete", true, 1.0],
      [ContainerRequest, 'queued', 'cwu', 0, "Queued", nil, 0.0],   # priority 1
      [ContainerRequest, 'canceled_with_queued_container', 'cwu', 0, "Cancelled", false, 0.0],
 -    [ContainerRequest, 'canceled_with_locked_container', 'cwu', 0, "Queued", nil, 0.0],
 +    [ContainerRequest, 'canceled_with_locked_container', 'cwu', 0, "Cancelled", false, 0.0],
      [ContainerRequest, 'canceled_with_running_container', 'cwu', 1, "Running", nil, 0.0],
    ].each do |type, fixture, label, num_children, state, success, progress|
      test "children of #{fixture}" do