[ARVADOS] updated: 10e7635b3627c7a70f9ed4bc5adee92854a3a274

[Git user]

Summary of changes:
 apps/workbench/app/models/proxy_work_unit.rb       | 112 ++++++++++++++++++++-
 apps/workbench/app/models/work_unit.rb             |  49 +++++++++
 .../app/views/work_unit/_component_detail.html.erb |   4 +
 .../app/views/work_unit/_progress.html.erb         |   2 +-
 .../app/views/work_unit/_show_child.html.erb       |  54 +++-------
 .../app/views/work_unit/_show_component.html.erb   |  50 ++++-----
 .../pipeline_instances_controller_test.rb          |   8 +-
 apps/workbench/test/integration/jobs_test.rb       |   2 +-
 apps/workbench/test/unit/work_unit_test.rb         |  69 ++++++++++++-
 services/api/test/fixtures/containers.yml          |   2 +-
 services/api/test/fixtures/pipeline_instances.yml  |   2 +
 11 files changed, 269 insertions(+), 85 deletions(-)

       via  10e7635b3627c7a70f9ed4bc5adee92854a3a274 (commit)
       via  8974e10fe2dbf643861f75cffa0fba9a6db972c8 (commit)
       via  aface0b74e6b3cfaaa8d773218a5ada423a7654b (commit)
       via  d1d4aba8c3eb7e3b605639a4b02cb9d26c033ad2 (commit)
       via  3d60a5dcfb6765b223d224dda3980226230464d0 (commit)
      from  f9def1f7abc8ad6720d9b88ec541b00a03ff1d0e (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 10e7635b3627c7a70f9ed4bc5adee92854a3a274
Merge: f9def1f 8974e10
Author: radhika <radhika at curoverse.com>
Date:   Sat Jun 4 19:19:20 2016 -0400

    Merge branch '8650-container-work-unit' into 9318-dashboard-uses-work-units
    
    Conflicts:
    	apps/workbench/app/views/work_unit/_progress.html.erb
    	apps/workbench/test/unit/work_unit_test.rb

diff --cc apps/workbench/app/views/work_unit/_progress.html.erb
index 27f19ec,e06bad6..69a3788
--- a/apps/workbench/app/views/work_unit/_progress.html.erb
+++ b/apps/workbench/app/views/work_unit/_progress.html.erb
@@@ -1,5 -1,5 +1,5 @@@
- <% if wu.state_label == 'Running' %>
+ <% if wu.is_running? %>
 -  <% if @object.uuid == wu.uuid and wu.progress == 0.0 %>
 +  <% if @object.andand.uuid == wu.uuid and wu.progress == 0.0 %>
      <span class="label label-<%= wu.state_bootstrap_class %>"> Active </span>
    <% else%>
      <div class="progress" style="margin-bottom: 0px">
diff --cc apps/workbench/test/unit/work_unit_test.rb
index 974002c,f00644e..cc3334d
--- a/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@@ -6,11 -10,11 +10,11 @@@ 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],
 -    [Container, 'requester', 'cwu', 3, "Complete", true, 1.0],
 +    [Container, 'requester', 'cwu', 5, "Complete", true, 1.0],
-   ].each do |type, name, label, num_children, state, success, progress|
-     test "children of #{name}" do
-       use_token 'admin'
-       obj = find_fixture(type, name)
+   ].each do |type, fixture, label, num_children, state, success, progress|
+     test "children of #{fixture}" do
 -      use_token 'admin'
++      use_token 'active'
+       obj = find_fixture(type, fixture)
        wu = obj.work_unit(label)
  
        if label != nil
diff --cc services/api/test/fixtures/containers.yml
index febd3df,4c8c8c1..5f358b7
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@@ -102,7 -48,7 +102,7 @@@ completed_older
  
  requester:
    uuid: zzzzz-dz642-requestingcntnr
--  owner_uuid: zzzzz-tpzed-000000000000000
++  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
    state: Complete
    priority: 1
    created_at: 2016-01-11 11:11:11.111111111 Z

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


hooks/post-receive
--