swarming: switch to a 'capability focused' ACL system

appengine/swarming/handlers_endpoints_test.py

 #!/usr/bin/env python
 # coding=utf-8
 # Copyright 2015 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import base64
 import datetime
 import json
 import logging
@@ skipping 1334 matching lines @@
           u'service_account:none',
           u'user:joe@localhost',
         ],
         u'task_id': task_id,
         u'try_number': u'1',
         u'user': u'joe@localhost',
       }
       out.update((unicode(k), v) for k, v in kwargs.iteritems())
       return out
 
-    def _cycle(params, expected, must_stop):
-      response = self.post_json('/swarming/api/v1/bot/task_update', params)
-      self.assertEqual({u'must_stop': must_stop, u'ok': True}, response)
-      self.assertEqual(expected, self.client_get_results(task_id))
-
+    self.set_as_bot()
     params = _params(output=base64.b64encode('Oh '))
-    expected = _expected()
-    _cycle(params, expected, False)
+    response = self.post_json('/swarming/api/v1/bot/task_update', params)
+    self.assertEqual({u'must_stop': False, u'ok': True}, response)
+    self.set_as_user()
+    self.assertEqual(_expected(), self.client_get_results(task_id))
 
     # Canceling a running task is currently not supported.
-    self.set_as_user()
-    expected = {u'ok': False, u'was_running': True}
     response = self.call_api('cancel', body={'task_id': task_id})
-    self.assertEqual(expected, response.json)
+    self.assertEqual({u'ok': False, u'was_running': True}, response.json)
 
     self.set_as_bot()
     params = _params(output=base64.b64encode('hi'), output_chunk_start=3)
-    expected = _expected()
-    _cycle(params, expected, False)
+    response = self.post_json('/swarming/api/v1/bot/task_update', params)
+    self.assertEqual({u'must_stop': False, u'ok': True}, response)
+    self.set_as_user()
+    self.assertEqual(_expected(), self.client_get_results(task_id))
 
   def test_result_unknown(self):
     """Asserts that result raises 404 for unknown task IDs."""
     self.call_api('result', body={'task_id': '12310'}, status=404)
 
   def test_result_ok(self):
     """Asserts that result produces a result entity."""
     self.mock(random, 'getrandbits', lambda _: 0x88)
 
     # pending task
@@ skipping 554 matching lines @@
     self.assertEqual(expected, response.json)
 
   def test_get_no_bot(self):
     """Asserts that get raises 404 when no bot is found."""
     self.set_as_admin()
     self.call_api('get', body={'bot_id': 'not_a_bot'}, status=404)
 
   def test_delete_ok(self):
     """Assert that delete finds and deletes a bot."""
     self.set_as_admin()
-    self.mock(acl, 'is_admin', lambda *_args, **_kwargs: True)
+    self.mock(acl, '_is_admin', lambda *_args, **_kwargs: True)
     now = datetime.datetime(2010, 1, 2, 3, 4, 5, 6)
     self.mock_now(now)
     state = {
       'dict': {'random': 'values'},
       'float': 0.,
       'list': ['of', 'things'],
       'str': u'uni',
     }
     bot_management.bot_event(
         event_type='bot_connected', bot_id='id1',
@@ skipping 230 matching lines @@
     self.call_api('terminate', body={'bot_id': 'bot1'}, status=403)
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
     logging.basicConfig(level=logging.DEBUG)
   else:
     logging.basicConfig(level=logging.CRITICAL)
   unittest.main()