swarming: refactor cipd input

appengine/swarming/test_env_handlers.py

 # coding: utf-8
 # Copyright 2014 The LUCI 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.
 
 """Base class for handlers_*_test.py"""
 
 import base64
 import json
 import os
 
 import test_env
 test_env.setup_test_env()
 
 from google.appengine.api import users
 from google.appengine.ext import ndb
 
 import endpoints
 from protorpc.remote import protojson
 import webtest
 
 import handlers_endpoints
 import swarming_rpcs
 from components import auth
 from components import auth_testing
 from components import stats_framework
 import gae_ts_mon
 from test_support import test_case
 
+from proto import config_pb2
 from server import acl
 from server import large
 from server import stats
 
 
-PINNED_PACKAGE_VERSION = 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
+CIPD_SETTINGS = config_pb2.CipdSettings(
+    server_host='chrome-infra-packages.appspot.com',
+    client_package_name='infra/tools/cipd/${platform}',
+    client_package_version='git_revision:deadbeef')
+PINNED_PACKAGE_VERSION = 'git_revision:deadbeef'
 
 
 class AppTestBase(test_case.TestCase):
   APP_DIR = test_env.APP_DIR
 
   def setUp(self):
     super(AppTestBase, self).setUp()
     self.bot_version = None
     self.source_ip = '192.168.2.2'
     self.testbed.init_user_stub()
@@ skipping 165 matching lines @@
     return task_id
 
   # Client
 
   def endpoint_call(self, service, name, args):
     body = json.loads(protojson.encode_message(args))
     return test_case.Endpoints(service).call_api(name, body=body).json
 
   def _client_create_task(self, properties=None, **kwargs):
     """Creates an isolated command TaskRequest via the Cloud Endpoints API."""
-    params = {
-      'packages': [{
-        'package_name': 'rm',
-        'version': PINNED_PACKAGE_VERSION,
-      }],
+    props = {
+      'cipd_input': {
+        'packages': [{
+          'package_name': 'rm',
+          'version': PINNED_PACKAGE_VERSION,
+        }],
+        'settings': CIPD_SETTINGS.SerializeToString(),
+      },
       'dimensions': [
         {'key': 'os', 'value': 'Amiga'},
         {'key': 'pool', 'value': 'default'},
       ],
       'env': [],
       'execution_timeout_secs': 3600,
       'io_timeout_secs': 1200,
     }
-    params.update(properties or {})
-    props = swarming_rpcs.TaskProperties(**params)
+    props.update(properties or {})
 
     params = {
       'expiration_secs': 24*60*60,
       'name': 'hi',
       'priority': 10,
+      'properties': props,
       'tags': [],
       'user': 'joe@localhost',
     }
     params.update(kwargs)
-    request = swarming_rpcs.TaskRequest(properties=props, **params)
+
+    # Note that protorpc message constructor accepts dicts for submessages.
+    request = swarming_rpcs.TaskRequest(**params)
     response = self.endpoint_call(
         handlers_endpoints.SwarmingTasksService, 'new', request)
     return response, response['task_id']
 
   def client_create_task_isolated(self, properties=None, **kwargs):
     properties = (properties or {}).copy()
     properties['inputs_ref'] = {
       'isolated': '0123456789012345678901234567890123456789',
       'isolatedserver': 'http://localhost:1',
       'namespace': 'default-gzip',
     }
     return self._client_create_task(properties, **kwargs)
 
   def client_create_task_raw(self, properties=None, **kwargs):
     """Creates a raw command TaskRequest via the Cloud Endpoints API."""
     properties = (properties or {}).copy()
     properties['command'] = ['python', 'run_test.py']
     return self._client_create_task(properties, **kwargs)
 
   def client_get_results(self, task_id):
     api = test_case.Endpoints(handlers_endpoints.SwarmingTaskService)
     return api.call_api('result', body={'task_id': task_id}).json