[ARVADOS] updated: 1.3.0-995-g33c298ad7

[Git user]

Summary of changes:
 services/api/test/integration/collections_api_test.rb | 1 +
 1 file changed, 1 insertion(+)

  discards  3b004515ed500910533f63cbfd10de28d88ca7f3 (commit)
       via  33c298ad7c00c336cd628e04b6478d725c9acf62 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (3b004515ed500910533f63cbfd10de28d88ca7f3)
            \
             N -- N -- N (33c298ad7c00c336cd628e04b6478d725c9acf62)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 33c298ad7c00c336cd628e04b6478d725c9acf62
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jun 4 14:02:02 2019 -0400

    15306: Adjust tests: check ?include_trash= and avoid paging.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/test/integration/collections_api_test.rb b/services/api/test/integration/collections_api_test.rb
index 78edbffa6..ed2d2fd7f 100644
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@ -276,19 +276,17 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
   end
 
   [
+    ["", false],
     ["false", false],
     ["0", false],
     ["true", true],
     ["1", true]
   ].each do |param, truthiness|
-    test "include_trash=#{param} param encoding via query string should be interpreted as include_trash=#{truthiness}" do
+    test "include_trash=#{param.inspect} param encoding via query string should be interpreted as include_trash=#{truthiness}" do
       expired_col = collections(:expired_collection)
       assert expired_col.is_trashed
-      params = {
-        :include_trash => param,
-      }
-      get "/arvados/v1/collections?#{params.to_query}",
-        headers: auth(:active)
+      get("/arvados/v1/collections?include_trash=#{param}",
+          headers: auth(:active))
       assert_response :success
       assert_not_nil json_response['items']
       refute_empty json_response['items']
@@ -297,16 +295,18 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
   end
 
   [
+    ["", false],
     ["false", false],
     ["0", false],
     ["true", true],
     ["1", true]
   ].each do |param, truthiness|
-    test "include_trash=#{param} form-encoded param should be interpreted as include_trash=#{truthiness}" do
+    test "include_trash=#{param.inspect} form-encoded param should be interpreted as include_trash=#{truthiness}" do
       expired_col = collections(:expired_collection)
       assert expired_col.is_trashed
       params = [
         ['include_trash', param],
+        ['filters', [['uuid','=',expired_col.uuid]].to_json],
       ]
       get "/arvados/v1/collections",
         params: URI.encode_www_form(params),

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


hooks/post-receive
--