[ARVADOS] updated: d70adee422f8f68debdf4425fea8afd53a488556

[Git user]

Summary of changes:
 apps/workbench/test/integration/work_units_test.rb | 6 ++++--
 apps/workbench/test/unit/work_unit_test.rb         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

       via  d70adee422f8f68debdf4425fea8afd53a488556 (commit)
      from  6757824d984496469cd929cdbb62643c1cede7fd (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 d70adee422f8f68debdf4425fea8afd53a488556
Author: radhika <radhika at curoverse.com>
Date:   Fri Oct 7 14:32:32 2016 -0400

    10078: fix failing test due to new fixture addition

diff --git a/apps/workbench/test/integration/work_units_test.rb b/apps/workbench/test/integration/work_units_test.rb
index eded53e..b1d5a21 100644
--- a/apps/workbench/test/integration/work_units_test.rb
+++ b/apps/workbench/test/integration/work_units_test.rb
@@ -74,12 +74,14 @@ class WorkUnitsTest < ActionDispatch::IntegrationTest
       visit page_with_token "active", "/#{type}/#{obj['uuid']}"
 
       assert_text 'created_at'
+
       if cancelable
+        assert_text 'priority: 1' if type.include?('container')
         assert_selector 'button', text: 'Cancel'
-        click_button 'Cancel'
+        first('a,button', text: 'Cancel').click
         wait_for_ajax
       end
-      assert_no_selector 'button', text: 'Cancel'
+      assert_text 'priority: 0' if cancelable and type.include?('container')
     end
   end
 
diff --git a/apps/workbench/test/unit/work_unit_test.rb b/apps/workbench/test/unit/work_unit_test.rb
index 550f218..e59d30d 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'

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


hooks/post-receive
--