swarmbucket: add $project template parameter

appengine/cr-buildbucket/test/config_test.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 
 from components import config as config_component
 from components.config import validation_context
 from testing_utils import testing
 import mock
@@ skipping 54 matching lines @@
 ''')
 
 
 class ConfigTest(testing.AppengineTestCase):
   def test_get_bucket_async(self):
     config.Bucket(
       id='master.tryserver.chromium.linux',
       project_id='chromium',
       revision='deadbeef',
       config_content=MASTER_TRYSERVER_CHROMIUM_LINUX_CONFIG_TEXT).put()
-    cfg = config.get_bucket_async(
+    project, cfg = config.get_bucket_async(
       'master.tryserver.chromium.linux').get_result()
+    self.assertEqual(project, 'chromium')
     self.assertEqual(
       cfg,
       project_config_pb2.Bucket(
         name='master.tryserver.chromium.linux',
         acls=[
           project_config_pb2.Acl(
             role=project_config_pb2.Acl.READER, group='all'),
           project_config_pb2.Acl(
             role=project_config_pb2.Acl.SCHEDULER, group='tryjob-access'),
         ]),
     )
 
-    self.assertIsNone(config.get_bucket_async('non.existing').get_result())
+    self.assertIsNone(config.get_bucket_async('non.existing').get_result()[0])
 
   def test_get_buckets_async(self):
     config.Bucket(
       id='master.tryserver.chromium.linux',
       project_id='chromium',
       revision='deadbeef',
       config_content=MASTER_TRYSERVER_CHROMIUM_LINUX_CONFIG_TEXT).put()
     config.Bucket(
       id='master.tryserver.chromium.win',
       project_id='chromium',
@@ skipping 344 matching lines @@
 
     url = config.get_buildbucket_cfg_url('chromium')
     self.assertEqual(
       url,
       ('https://chromium.googlesource.com/chromium/src/+/'
        'infra/config/testbed-test.cfg'))
 
 
 def errmsg(text):
   return validation_context.Message(severity=logging.ERROR, text=text)