X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0821f5481edd016a3744bb50d97a9e5b99cd1a0f..4dd318184615c0ff83501dfa7935daea5511bb17:/apps/workbench/test/unit/work_unit_test.rb

diff --git a/apps/workbench/test/unit/work_unit_test.rb b/apps/workbench/test/unit/work_unit_test.rb
index 550f2188c1..564a5d3b5b 100644
--- a/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@ -15,7 +15,7 @@ class WorkUnitTest < ActiveSupport::TestCase
     [ContainerRequest, 'queued', 'cwu', 0, "Queued", nil, 0.0],   # priority 1
     [ContainerRequest, 'canceled_with_queued_container', 'cwu', 0, "Ready", nil, 0.0],
     [ContainerRequest, 'canceled_with_locked_container', 'cwu', 0, "Ready", nil, 0.0],
-    [ContainerRequest, 'canceled_with_running_container', 'cwu', 0, "Running", nil, 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
       use_token 'active'
@@ -53,11 +53,11 @@ class WorkUnitTest < ActiveSupport::TestCase
   end
 
   [
-    [Job, 'running_job_with_components', 1, 1, nil],
-    [Job, 'queued', nil, nil, 1],
-    [PipelineInstance, 'pipeline_in_running_state', 1, 1, nil],
-    [PipelineInstance, 'has_component_with_completed_jobs', 60, 60, nil],
-  ].each do |type, fixture, walltime, cputime, queuedtime|
+    [Job, 'running_job_with_components', 1, 1, nil, true],
+    [Job, 'queued', nil, 0, 1, false],
+    [PipelineInstance, 'pipeline_in_running_state', 1, 1, nil, false],
+    [PipelineInstance, 'has_component_with_completed_jobs', 60, 60, nil, true],
+  ].each do |type, fixture, walltime, cputime, queuedtime, cputime_more_than_walltime|
     test "times for #{fixture}" do
       use_token 'active'
       obj = find_fixture(type, fixture)
@@ -80,32 +80,8 @@ class WorkUnitTest < ActiveSupport::TestCase
       else
         assert_equal queuedtime, wu.queuedtime
       end
-    end
-  end
 
-  [
-    [Job, 'active', 'running_job_with_components', true],
-    [Job, 'active', 'queued', false],
-    [Job, nil, 'completed_job_in_publicly_accessible_project', true],
-    [Job, 'active', 'completed_job_in_publicly_accessible_project', true],
-    [PipelineInstance, 'active', 'pipeline_in_running_state', true],  # no log, but while running the log link points to pi Log tab
-    [PipelineInstance, nil, 'pipeline_in_publicly_accessible_project_but_other_objects_elsewhere', false],
-    [PipelineInstance, 'active', 'pipeline_in_publicly_accessible_project_but_other_objects_elsewhere', false], #no log for completed pi
-    [Job, nil, 'job_in_publicly_accessible_project_but_other_objects_elsewhere', false, "Log unavailable"],
-  ].each do |type, token, fixture, has_log, log_link|
-    test "link_to_log for #{fixture} for #{token}" do
-      use_token token if token
-      obj = find_fixture(type, fixture)
-      wu = obj.work_unit
-
-      link = "#{wu.uri}#Log" if has_log
-      link_to_log = wu.link_to_log
-
-      if has_log
-        assert_includes link_to_log, link
-      else
-        assert_equal log_link, link_to_log
-      end
+      assert_equal cputime_more_than_walltime, (wu.cputime > wu.walltime) if wu.cputime and wu.walltime
     end
   end