7709: Merge branch 'master' into 7709-api-rails4

[arvados.git] / 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 0ff38140e1a6f976ffc5b0da27e73b43415b4d54..8bbbb5cf26a993b3e408f923f0899097b971d8eb 100644 (file)
--- a/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@ -1,6 +1,9 @@
 require 'test_helper'
 
 class WorkUnitTest < ActiveSupport::TestCase
+
+  reset_api_fixtures :after_each_test, false
+
   setup do
     Rails.configuration.anonymous_user_token = api_fixture('api_client_authorizations')['anonymous']['api_token']
   end
@@ -53,11 +56,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,6 +83,8 @@ class WorkUnitTest < ActiveSupport::TestCase
       else
         assert_equal queuedtime, wu.queuedtime
       end
+
+      assert_equal cputime_more_than_walltime, (wu.cputime > wu.walltime) if wu.cputime and wu.walltime
     end
   end