[ARVADOS] updated: 7ea93a3e137a3375daa76073ddbd582deb22141c

Git user git at public.curoverse.com
Fri May 5 13:30:52 EDT 2017


Summary of changes:
 .../container_requests_controller_test.rb          |   4 +-
 .../controllers/arvados/v1/schema_controller.rb    |   7 +
 services/api/config/application.default.yml        |   4 +-
 services/api/test/fixtures/container_requests.yml  |   4 +-
 services/crunch-run/crunchrun.go                   |  19 +-
 services/crunch-run/crunchrun_test.go              |  11 +-
 services/crunch-run/logging.go                     | 234 +++++++++++++++++++--
 services/crunch-run/logging_test.go                |  43 ++++
 8 files changed, 295 insertions(+), 31 deletions(-)

       via  7ea93a3e137a3375daa76073ddbd582deb22141c (commit)
       via  50a1f82945a564e16b564c9cab009dac8ec78a37 (commit)
       via  3b4325c210516d1f61838fb26e06e0a11c31ce6d (commit)
       via  007d2919fc56632bc957d90378ed7a5d3b14aa3c (commit)
       via  f389a552e9b81de0e2030fe2fddc4852b33f63cc (commit)
       via  e4f03346d4498a77d252d2ffb08d1e0246785b5e (commit)
       via  f10431fe2de1037c3c0d51d8238cecf6c1206703 (commit)
       via  e54bce82515daeef450f53aa93d3acae397bfa5f (commit)
       via  5d00ecb0932f86e4d2aced3d9258b96522ef38bd (commit)
       via  712968da0c8575de1ac6968772999c2439636e2a (commit)
       via  3acd5d7f73c24a2ea2d686588be44efb9ac056b2 (commit)
       via  c5c09df38966595b4f27c402d1e9ae5500d6d201 (commit)
       via  455f862a19fe0bcc8ac3c6e685a96faf747ae623 (commit)
       via  8622b46a4a6c127a1927d9c2e54febec6a5bf503 (commit)
       via  4344941f8410ed21befead8d6b8d2471d291032f (commit)
       via  9dabca0eedbc9f842d542fea3463a441140d590c (commit)
       via  6e577058389e70fd575580c3e11a122396140700 (commit)
       via  fd65e0be3f55d48b9d573921ca0757fc51a1dd81 (commit)
       via  f1fb39153bc234b49ca77674a29abc029b12774a (commit)
       via  5e4bf6836d9762ef5552111776dcbade99f2e680 (commit)
      from  d23bc7c1abe6b81ae279298bf606f44c0d99f7fa (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 7ea93a3e137a3375daa76073ddbd582deb22141c
Merge: 50a1f82 3b4325c
Author: radhika <radhika at curoverse.com>
Date:   Fri May 5 13:30:38 2017 -0400

    Merge branch 'master' into 10645-cr-mounts-display


commit 50a1f82945a564e16b564c9cab009dac8ec78a37
Author: radhika <radhika at curoverse.com>
Date:   Fri May 5 13:29:59 2017 -0400

    10645: corrections to test fixture

diff --git a/apps/workbench/test/controllers/container_requests_controller_test.rb b/apps/workbench/test/controllers/container_requests_controller_test.rb
index 381bd5b..45be6a1 100644
--- a/apps/workbench/test/controllers/container_requests_controller_test.rb
+++ b/apps/workbench/test/controllers/container_requests_controller_test.rb
@@ -116,8 +116,8 @@ class ContainerRequestsControllerTest < ActionController::TestCase
     assert_response :success
 
     assert_includes @response.body, CGI.escapeHTML(cr['command'].to_s)
-    assert_includes @response.body, "href=\"\/collections/acbd18db4cc2f85cedef654fccc4a4d8+3%2Ffoo" # mount input1
-    assert_includes @response.body, "href=\"\/collections/37b51d194a7513e45b56f6524f2d51f2+3%2Fbar" # mount input2
+    assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45%2Ffoo" # mount input1
+    assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45%2Fbar" # mount input2
     assert_includes @response.body, "href=\"\/collections/1fd08fc162a5c6413070a8bd0bffc818+150" # mount workflow
     assert_includes @response.body, "href=\"#Log\""
     assert_includes @response.body, "href=\"#Provenance\""
diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index ef65fb2..007e231 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -294,11 +294,11 @@ completed_with_input_mounts:
         input1:
           basename: foo
           class: File
-          location: "keep:acbd18db4cc2f85cedef654fccc4a4d8+3/foo"
+          location: "keep:fa7aeb5140e2848d39b416daeef4ffc5+45/foo"
         input2:
           basename: bar
           class: File
-          location: "keep:37b51d194a7513e45b56f6524f2d51f2+3/bar"
+          location: "keep:fa7aeb5140e2848d39b416daeef4ffc5+45/bar"
     /var/lib/cwl/workflow.json: "keep:1fd08fc162a5c6413070a8bd0bffc818+150"
 
 uncommitted:

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list