[ARVADOS] updated: 2.1.0-32-g5cfe4fda1

Git user git at public.arvados.org
Tue Nov 3 21:08:00 UTC 2020


Summary of changes:

       via  5cfe4fda15d5de55ad6a6d9d172933e130b06de6 (commit)
       via  bb131f1aa148132bb950a56a5168489498d9911f (commit)
       via  175edca67a4e0c385c077a3af59dc803cb03464a (commit)
      from  e44eeec166c707c5ee18ab3f6a4c3128e6144bc9 (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 5cfe4fda15d5de55ad6a6d9d172933e130b06de6
Merge: e44eeec16 bb131f1aa
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Nov 3 16:07:17 2020 -0500

    Merge commit 'bb131f1aa' into 17014-controller-cr
    
    Arvados-DCO-1.1-Signed-off-by: <nico at curii.com>


commit bb131f1aa148132bb950a56a5168489498d9911f
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Nov 3 14:09:44 2020 -0300

    17014: Fixes test.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/apps/workbench/test/controllers/container_requests_controller_test.rb b/apps/workbench/test/controllers/container_requests_controller_test.rb
index 140b59fa5..d306a2ab9 100644
--- a/apps/workbench/test/controllers/container_requests_controller_test.rb
+++ b/apps/workbench/test/controllers/container_requests_controller_test.rb
@@ -137,7 +137,6 @@ class ContainerRequestsControllerTest < ActionController::TestCase
     assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/foobar\?" # locator on command
     assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/foo" # mount input1
     assert_includes @response.body, "href=\"\/collections/fa7aeb5140e2848d39b416daeef4ffc5+45/bar" # mount input2
-    assert_includes @response.body, "href=\"\/collections/f9ddda46bb293b6847da984e3aa735db+290" # mount workflow
     assert_includes @response.body, "href=\"#Log\""
     assert_includes @response.body, "href=\"#Provenance\""
   end
diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index e27af2c98..daaaf4d08 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -341,8 +341,7 @@ completed_with_input_mounts:
           "location": "keep:fa7aeb5140e2848d39b416daeef4ffc5+45/bar",
         }
       }
-    },
-    "/var/lib/cwl/workflow.json": "keep:f9ddda46bb293b6847da984e3aa735db+290"
+    }
   }
 
 uncommitted:

commit 175edca67a4e0c385c077a3af59dc803cb03464a
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Nov 3 13:23:43 2020 -0300

    17014: Reverts fixture removal.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index daaaf4d08..e27af2c98 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -341,7 +341,8 @@ completed_with_input_mounts:
           "location": "keep:fa7aeb5140e2848d39b416daeef4ffc5+45/bar",
         }
       }
-    }
+    },
+    "/var/lib/cwl/workflow.json": "keep:f9ddda46bb293b6847da984e3aa735db+290"
   }
 
 uncommitted:

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list