[ARVADOS] updated: 1.2.0-90-g77f0b1bfa

[Git user]

Summary of changes:
 .../20180820132617_add_lock_index_to_containers.rb | 13 ++++++++
 ...20180824155207_add_queue_index_to_containers.rb | 12 +++++++
 services/api/db/structure.sql                      | 25 ++++++++++++++
 .../arvados/v1/groups_controller_test.rb           | 38 +++++++++++-----------
 4 files changed, 69 insertions(+), 19 deletions(-)
 create mode 100644 services/api/db/migrate/20180820132617_add_lock_index_to_containers.rb
 create mode 100644 services/api/db/migrate/20180824155207_add_queue_index_to_containers.rb

       via  77f0b1bfa00972e13d10233c8c5f08d7ac7e0c1b (commit)
       via  e0b527579fe18fa5ed01739e2cc5528e0777584e (commit)
       via  6eb2a147f40a3ea01b45266b1281244098d024e8 (commit)
       via  3e5ac41e4e38e6c8fa72883b803d85fcde53e25b (commit)
       via  b43cf1d3398b7004ada50e053ae235b814c9aa70 (commit)
       via  572601ef7712342e599e2b2abf22268f8f378b07 (commit)
       via  2df6f028ca8b1ec3abb6f15eaf949174ccbb8586 (commit)
      from  9d413ff4e3868761422f79b4f81177cec05cbae5 (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 77f0b1bfa00972e13d10233c8c5f08d7ac7e0c1b
Merge: e0b527579 3e5ac41e4
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Sep 4 15:37:57 2018 -0400

    Merge branch '14008-containers-index'
    
    refs #14008
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


commit e0b527579fe18fa5ed01739e2cc5528e0777584e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Sep 4 11:25:51 2018 -0400

    Add test case for filtering on is_trashed in groups#contents.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index cf1457ea2..05bcec2e2 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -116,6 +116,25 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
     end
   end
 
+  test "list trashed collections and projects" do
+    authorize_with :active
+    get(:contents, {
+          format: :json,
+          include_trash: true,
+          filters: [
+            ['uuid', 'is_a', ['arvados#collection', 'arvados#group']],
+            ['is_trashed', '=', true],
+          ],
+          limit: 10000,
+        })
+    assert_response :success
+    found_uuids = json_response['items'].collect { |i| i['uuid'] }
+    assert_includes found_uuids, groups(:trashed_project).uuid
+    refute_includes found_uuids, groups(:aproject).uuid
+    assert_includes found_uuids, collections(:expired_collection).uuid
+    refute_includes found_uuids, collections(:w_a_z_file).uuid
+  end
+
   test "list objects in home project" do
     authorize_with :active
     get :contents, {

commit 6eb2a147f40a3ea01b45266b1281244098d024e8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Sep 4 11:25:18 2018 -0400

    Remove redundant test case.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/test/functional/arvados/v1/groups_controller_test.rb b/services/api/test/functional/arvados/v1/groups_controller_test.rb
index 4506f76c6..cf1457ea2 100644
--- a/services/api/test/functional/arvados/v1/groups_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/groups_controller_test.rb
@@ -194,25 +194,6 @@ class Arvados::V1::GroupsControllerTest < ActionController::TestCase
     assert actually_checked_anything, "Didn't even find two items to compare."
   end
 
-  test 'list objects across multiple projects' do
-    authorize_with :project_viewer
-    get :contents, {
-      format: :json,
-      filters: [['uuid', 'is_a', 'arvados#specimen']]
-    }
-    assert_response :success
-    found_uuids = json_response['items'].collect { |i| i['uuid'] }
-    [[:in_aproject, true],
-     [:in_asubproject, true],
-     [:owned_by_private_group, false]].each do |specimen_fixture, should_find|
-      if should_find
-        assert_includes found_uuids, specimens(specimen_fixture).uuid, "did not find specimen fixture '#{specimen_fixture}'"
-      else
-        refute_includes found_uuids, specimens(specimen_fixture).uuid, "found specimen fixture '#{specimen_fixture}'"
-      end
-    end
-  end
-
   # Even though the project_viewer tests go through other controllers,
   # I'm putting them here so they're easy to find alongside the other
   # project tests.

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


hooks/post-receive
--