config_service: fetch repos and metadata concurrently

appengine/config_service/api_test.py

 #!/usr/bin/env python
 # 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 httplib
 
 import test_env
@@ skipping 25 matching lines @@
         lambda pids: {pid: pid != 'secret' for pid in pids}
     )
 
     self.mock(
         acl, 'has_services_access', lambda sids: {sid: True for sid in sids})
     self.mock(projects, 'get_projects', mock.Mock())
     projects.get_projects.return_value = [
       service_config_pb2.Project(id='chromium'),
       service_config_pb2.Project(id='v8'),
     ]
-    self.mock(projects, 'get_metadata', mock.Mock())
-    projects.get_metadata.return_value = {
+    self.mock(projects, 'get_metadata_async', mock.Mock(return_value=future({
       'chromium': project_config_pb2.ProjectCfg(),
       'v8': project_config_pb2.ProjectCfg(),
-    }
-    self.mock(projects, 'get_repos', mock.Mock())
-    projects.get_repos.return_value = {
+    })))
+    self.mock(projects, 'get_repos_async', mock.Mock(return_value=future({
       'chromium': (
           projects.RepositoryType.GITILES, 'https://chromium.example.com'),
       'v8': (
           projects.RepositoryType.GITILES, 'https://v8.example.com'),
-    }
+    })))
 
   def mock_config(self, mock_content=True):
     self.mock(storage, 'get_config_hashes_async', mock.Mock())
     storage.get_config_hashes_async.return_value = future({
       'services/luci-config': ('deadbeef', 'abc0123'),
     })
 
     if mock_content:
       self.mock(storage, 'get_configs_by_hashes_async', mock.Mock())
       storage.get_configs_by_hashes_async.return_value = future({
@@ skipping 419 matching lines @@
   ##############################################################################
   # get_projects
 
   def test_get_projects(self):
     projects.get_projects.return_value = [
       service_config_pb2.Project(id='chromium'),
       service_config_pb2.Project(id='v8'),
       service_config_pb2.Project(id='inconsistent'),
       service_config_pb2.Project(id='secret'),
     ]
-    projects.get_metadata.return_value = {
+    projects.get_metadata_async.return_value = future({
       'chromium': project_config_pb2.ProjectCfg(
           name='Chromium, the best browser', access='all'),
       'v8': project_config_pb2.ProjectCfg(access='all'),
       'inconsistent': project_config_pb2.ProjectCfg(access='all'),
       'secret': project_config_pb2.ProjectCfg(access='administrators'),
-    }
-    projects.get_repos.return_value = {
+    })
+    projects.get_repos_async.return_value = future({
       'chromium': (
           projects.RepositoryType.GITILES, 'https://chromium.example.com'),
       'v8': (projects.RepositoryType.GITILES, 'https://v8.example.com'),
       'inconsistent': (None, None),
       'secret': (projects.RepositoryType.GITILES, 'https://localhost/secret'),
-    }
+    })
 
     resp = self.call_api('get_projects', {}).json_body
 
     self.assertEqual(resp, {
       'projects': [
         {
           'id': 'chromium',
           'name': 'Chromium, the best browser',
           'repo_type': 'GITILES',
           'repo_url': 'https://chromium.example.com',
@@ skipping 47 matching lines @@
       self.call_api('get_refs', req)
 
   ##############################################################################
   # get_project_configs
 
   def test_get_config_multi(self):
     projects.get_projects.return_value.extend([
       service_config_pb2.Project(id='inconsistent'),
       service_config_pb2.Project(id='secret'),
     ])
-    projects.get_metadata.return_value.update({
+    projects.get_metadata_async.return_value.get_result().update({
       'inconsistent': project_config_pb2.ProjectCfg(access='all'),
       'secret': project_config_pb2.ProjectCfg(access='administrators'),
     })
-    projects.get_repos.return_value.update({
+    projects.get_repos_async.return_value.get_result().update({
       'inconsistent': (None, None),
       'secret': (projects.RepositoryType.GITILES, 'https://localhost/secret'),
     })
 
     self.mock(storage, 'get_latest_configs_async', mock.Mock())
     storage.get_latest_configs_async.return_value = future({
       'projects/chromium': ('deadbeef', 'abc0123', 'config text'),
       'projects/v8': ('beefdead', 'ccc123', None),  # no content
       'projects/secret': ('badcoffee', 'abcabc', 'abcsdjksl'),
     })
 
     req = {'path': 'cq.cfg'}
     resp = self.call_api('get_project_configs', req).json_body
 
     self.assertEqual(resp, {
       'configs': [{
         'config_set': 'projects/chromium',
         'revision': 'deadbeef',
         'content_hash': 'abc0123',
         'content': base64.b64encode('config text'),
       }],
     })
 
   def test_get_config_multi_hashes_only(self):
     projects.get_projects.return_value.extend([
       service_config_pb2.Project(id='inconsistent'),
       service_config_pb2.Project(id='secret'),
     ])
-    projects.get_metadata.return_value.update({
+    projects.get_metadata_async.return_value.get_result().update({
       'inconsistent': project_config_pb2.ProjectCfg(access='all'),
       'secret': project_config_pb2.ProjectCfg(access='administrators'),
     })
-    projects.get_repos.return_value.update({
+    projects.get_repos_async.return_value.get_result().update({
       'inconsistent': (None, None),
       'secret': (projects.RepositoryType.GITILES, 'https://localhost/secret'),
     })
 
     self.mock(storage, 'get_latest_configs_async', mock.Mock())
     storage.get_latest_configs_async.return_value = future({
       'projects/chromium': ('deadbeef', 'abc0123', None),
       'projects/v8': ('beefdead', None, None),  # no content hash
       'projects/secret': ('badcoffee', 'abcabc', None),
     })
@@ skipping 47 matching lines @@
     self.mock(acl, 'is_admin', mock.Mock(return_value=True))
     self.mock(gitiles_import, 'import_config_set', mock.Mock())
     gitiles_import.import_config_set.side_effect = gitiles_import.Error
     req = {'config_set': 'services/x'}
     with self.call_should_fail(500):
       self.call_api('reimport', req)
 
 
 if __name__ == '__main__':
   test_env.main()