[ARVADOS] updated: 2e83bfa0e38b87632871f91cead42c9ead3d7bb7

[Git user]

Summary of changes:
 apps/workbench/app/models/proxy_work_unit.rb                   | 4 ++++
 apps/workbench/test/controllers/application_controller_test.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  2e83bfa0e38b87632871f91cead42c9ead3d7bb7 (commit)
       via  ccc2ef472f5048059194e67b973d663c07816de9 (commit)
      from  cee8f888b442448b2bffe243da2e9cc5dcf29b04 (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 2e83bfa0e38b87632871f91cead42c9ead3d7bb7
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Mon May 22 12:41:41 2017 -0300

    11501: Fix some tests when trying to use the walltime method on show_runtime.

diff --git a/apps/workbench/app/models/proxy_work_unit.rb b/apps/workbench/app/models/proxy_work_unit.rb
index 6da0f98..eb83238 100644
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@ -235,6 +235,10 @@ class ProxyWorkUnit < WorkUnit
   end
 
   def show_runtime
+    walltime = 0
+    if started_at
+      walltime = if finished_at then (finished_at - started_at) else (Time.now - started_at) end
+    end
     resp = '<p>'
 
     if started_at

commit ccc2ef472f5048059194e67b973d663c07816de9
Author: Lucas Di Pentima <lucas at curoverse.com>
Date:   Mon May 22 12:40:57 2017 -0300

    11501: Improved test name

diff --git a/apps/workbench/test/controllers/application_controller_test.rb b/apps/workbench/test/controllers/application_controller_test.rb
index 2554ec3..7c8c798 100644
--- a/apps/workbench/test/controllers/application_controller_test.rb
+++ b/apps/workbench/test/controllers/application_controller_test.rb
@@ -408,7 +408,7 @@ class ApplicationControllerTest < ActionController::TestCase
     [ProjectsController.new, api_fixture('groups')['anonymously_accessible_project']],
     [ProjectsController.new, api_fixture('groups')['anonymously_accessible_project'], false],
   ].each do |controller, fixture, anon_config=true|
-    test "#{controller} show method with anonymous config enabled" do
+    test "#{controller} show method with anonymous config #{anon_config ? '' : 'not '}enabled" do
       if anon_config
         Rails.configuration.anonymous_user_token = api_fixture('api_client_authorizations')['anonymous']['api_token']
       else

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


hooks/post-receive
--