[ARVADOS] updated: 10a83d8c408be74e56e687464b922473f72dd68f

[git at public.curoverse.com]

Summary of changes:
 .../test/integration/pipeline_instances_test.rb     | 10 +++++-----
 services/api/test/fixtures/pipeline_instances.yml   | 21 +++++++++++++++++----
 2 files changed, 22 insertions(+), 9 deletions(-)

       via  10a83d8c408be74e56e687464b922473f72dd68f (commit)
      from  4393148aceab9ae37c3a3f0eabcbf5e16ceaf3a3 (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 10a83d8c408be74e56e687464b922473f72dd68f
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Mar 3 14:56:19 2015 -0500

    5349: update test to use a new fixture.

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 69b8849..f8d5796 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -412,12 +412,12 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
   end
 
   [
-    ['zzzzz-d1hrv-10pipelines0001', 0], # run time 0 minutes
-    ['zzzzz-d1hrv-10pipelines0010', 17*60*60 + 51*60], # run time 17 hours and 51 minutes
-    ['zzzzz-d1hrv-10pipelines0002', nil], # state = running
-  ].each do |uuid, run_time|
+    ['user1_with_load', 'zzzzz-d1hrv-10pipelines0001', 0], # run time 0 minutes
+    ['user1_with_load', 'zzzzz-d1hrv-10pipelines0010', 17*60*60 + 51*60], # run time 17 hours and 51 minutes
+    ['active', 'zzzzz-d1hrv-runningpipeline', nil], # state = running
+  ].each do |user, uuid, run_time|
     test "pipeline start and finish time display for #{uuid}" do
-      visit page_with_token("user1_with_load", "/pipeline_instances/#{uuid}")
+      visit page_with_token(user, "/pipeline_instances/#{uuid}")
 
       assert page.has_text? 'This pipeline started at'
       page_text = page.text
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index dd1df3b..df01035 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -266,6 +266,23 @@ pipeline_in_publicly_accessible_project:
           dataclass: Collection
           title: foo instance input
 
+pipeline_in_running_state:
+  name: running_with_job
+  state: Ready
+  uuid: zzzzz-d1hrv-runningpipeline
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  created_at: <%= 3.1.minute.ago.to_s(:db) %>
+  started_at: <%= 3.1.minute.ago.to_s(:db) %>
+  state: RunningOnServer
+  components:
+   foo:
+    script: foo
+    script_version: master
+    script_parameters: {}
+    job:
+      uuid: zzzzz-8i9sb-pshmckwoma9plh7
+      script_version: master
+
 # Test Helper trims the rest of the file
 
 # Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
@@ -278,12 +295,8 @@ pipeline_<%=i%>_of_10:
   owner_uuid: zzzzz-j7d0g-000010pipelines
   created_at: <%= (2*(i-1)).hour.ago.to_s(:db) %>
   started_at: <%= (2*(i-1)).hour.ago.to_s(:db) %>
-<% if i != 2 %>
   finished_at: <%= (i-1).minute.ago.to_s(:db) %>
   state: Failed
-<% else %>
-  state: Running
-<% end %>
   components:
     foo:
       script: foo

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


hooks/post-receive
--