[ARVADOS] updated: fc2096f2825082d526a0d98323690a09ea9a5889

[git at public.curoverse.com]

Summary of changes:
 .../functional/arvados/v1/jobs_controller_test.rb  | 29 ++++++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

       via  fc2096f2825082d526a0d98323690a09ea9a5889 (commit)
      from  d60536bb1ca0eb6e72388a5287e786725dbdfd9e (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 fc2096f2825082d526a0d98323690a09ea9a5889
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Sep 17 15:00:02 2014 -0400

    3605: Test queue_size method and queue_position field.  Adjust "GET queue"
    tests for jobs controller to test that users don't see queue items for which
    they do not have permissions.

diff --git a/services/api/test/functional/arvados/v1/jobs_controller_test.rb b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
index e8245a4..ab21698 100644
--- a/services/api/test/functional/arvados/v1/jobs_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
@@ -284,18 +284,37 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  [:active, :admin].each do |which_token|
+  [:spectator, :admin].each_index do |i|
+    which_token = [:spectator, :admin][i]
     test "get job queue as #{which_token} user" do
       authorize_with which_token
       get :queue
       assert_response :success
-      assert_operator 1, :<=, assigns(:objects).count
+      assert_equal i, assigns(:objects).count
     end
-    test "get job queue as #{which_token} user, with a filter" do
+  end
+
+  test "get job queue as with a = filter" do
+    authorize_with :admin
+    get :queue, { filters: [['script','=','foo']] }
+    assert_response :success
+    assert_equal ['foo'], assigns(:objects).collect(&:script).uniq
+    assert_equal 0, assigns(:objects)[0].queue_position
+  end
+
+  test "get job queue as with a != filter" do
+    authorize_with :admin
+    get :queue, { filters: [['script','!=','foo']] }
+    assert_response :success
+    assert_equal 0, assigns(:objects).count
+  end
+
+  [:spectator, :admin].each do |which_token|
+    test "get queue_size as #{which_token} user" do
       authorize_with which_token
-      get :queue, { filters: [['script','=','foo']] }
+      get :queue_size
       assert_response :success
-      assert_equal ['foo'], assigns(:objects).collect(&:script).uniq
+      assert_equal 1, JSON.parse(@response.body)["queue_size"]
     end
   end
 

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


hooks/post-receive
--