Get rid of usage of old Swarming API in tests.

appengine/swarming/handlers_endpoints_test.py

 #!/usr/bin/env python
 # coding=utf-8
 # Copyright 2015 The Swarming Authors. All rights reserved.
 # Use of this source code is governed by the Apache v2.0 license that can be
 # found in the LICENSE file.
 
 import datetime
 import json
 import logging
 import os
 import random
 import sys
 import unittest
 
 import test_env_handlers
 from test_support import test_case
 
 from protorpc.remote import protojson
 import webapp2
 import webtest
 
 from components import auth
 from components import ereporter2
 from components import utils
 
-import handlers_api
 import handlers_bot
 import handlers_endpoints
 import swarming_rpcs
 
 from server import acl
 from server import bot_management
 from server import config
 
 
 def message_to_dict(rpc_message):
   return json.loads(protojson.encode_message(rpc_message))
 
 
 class BaseTest(test_env_handlers.AppTestBase, test_case.EndpointsTestCase):
 
   DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%f'
   DATETIME_NO_MICRO = '%Y-%m-%dT%H:%M:%S'
 
   def setUp(self):
     test_case.EndpointsTestCase.setUp(self)
     super(BaseTest, self).setUp()
     self.mock(auth, 'is_group_member', lambda *_args, **_kwargs: True)
     # handlers_bot is necessary to create fake tasks.
-    # TODO(maruel): Get rid of handlers_api.get_routes() here. The API should be
-    # self-sufficient.
-    routes = handlers_bot.get_routes() + handlers_api.get_routes()
     self.app = webtest.TestApp(
-        webapp2.WSGIApplication(routes, debug=True),
+        webapp2.WSGIApplication(handlers_bot.get_routes(), debug=True),
         extra_environ={
           'REMOTE_ADDR': self.source_ip,
           'SERVER_SOFTWARE': os.environ['SERVER_SOFTWARE'],
         })
     self.mock(
         ereporter2, 'log_request',
         lambda *args, **kwargs: self.fail('%s, %s' % (args, kwargs)))
     # Client API test cases run by default as user.
     self.set_as_user()
 
@@ skipping 14 matching lines @@
       content = f.read().decode('utf-8')
 
     expected = {
       u'content': content,
     }
     self.assertEqual(expected, self.call_api('get_' + name).json)
 
     expected = {
       u'version': u'0',
       u'when': u'2010-01-02T03:04:05',
-      u'who': u'anonymous:anonymous',
+      u'who': u'user:user@example.com',
     }
     response = self.call_api('put_' + name, {'content': u'hi ☀!'})
     self.assertEqual(expected, response.json)
 
     expected = {
       u'content': u'hi \u2600!',
       u'version': u'0',
       u'when': u'2010-01-02T03:04:05',
-      u'who': u'anonymous:anonymous',
+      u'who': u'user:user@example.com',
     }
     self.assertEqual(expected, self.call_api('get_' + name).json)
 
     self.mock_now(now, 60)
     expected = {
       u'version': u'1',
       u'when': u'2010-01-02T03:05:05',
-      u'who': u'anonymous:anonymous',
+      u'who': u'user:user@example.com',
     }
     response = self.call_api('put_' + name, {'content': u'hi ♕!'})
     self.assertEqual(expected, response.json)
 
     expected = {
       u'content': u'hi ♕!',
       u'version': u'1',
       u'when': u'2010-01-02T03:05:05',
-      u'who': u'anonymous:anonymous',
+      u'who': u'user:user@example.com',
     }
     self.assertEqual(expected, self.call_api('get_' + name).json)
 
     expected = {
       u'content': u'hi ☀!',
       u'version': u'0',
       u'when': u'2010-01-02T03:04:05',
-      u'who': u'anonymous:anonymous',
+      u'who': u'user:user@example.com',
     }
     response = self.call_api('get_' + name, {'version': '0'})
     self.assertEqual(expected, response.json)
 
   def test_bootstrap(self):
     self._test_file('bootstrap')
 
   def test_bot_config(self):
     self._test_file('bot_config')
 
@@ skipping 18 matching lines @@
             ],
             env=[
               swarming_rpcs.StringPair(key='PATH', value='/'),
               ],
             execution_timeout_secs=30,
             io_timeout_secs=30),
         tags=['foo:bar'],
         user='joe@localhost')
     expected = {
       u'request': {
-        u'authenticated': u'anonymous:anonymous',
+        u'authenticated': u'user:user@example.com',
         u'created_ts': str_now,
         u'expiration_secs': u'30',
         u'name': u'job1',
         u'priority': u'200',
         u'properties': {
           u'command': [u'rm', u'-rf', u'/'],
           u'dimensions': [
             {u'key': u'a', u'value': u'b'},
           ],
           u'env': [
@@ skipping 38 matching lines @@
             execution_timeout_secs=30,
             inputs_ref=swarming_rpcs.FilesRef(
                 isolated='1'*40,
                 isolatedserver='http://localhost:1',
                 namespace='default-gzip'),
             io_timeout_secs=30),
         tags=['foo:bar'],
         user='joe@localhost')
     expected = {
       u'request': {
-        u'authenticated': u'anonymous:anonymous',
+        u'authenticated': u'user:user@example.com',
         u'created_ts': str_now,
         u'expiration_secs': u'30',
         u'name': u'job1',
         u'priority': u'200',
         u'properties': {
           u'dimensions': [
             {u'key': u'a', u'value': u'b'},
             {u'key': u'foo', u'value': u'bar'},
           ],
           u'env': [
@@ skipping 526 matching lines @@
     self.assertEqual(expected, json_version)
 
 
 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()