swarming: refactor cipd input

appengine/swarming/test_env_handlers.py

Index: appengine/swarming/test_env_handlers.py
diff --git a/appengine/swarming/test_env_handlers.py b/appengine/swarming/test_env_handlers.py
index 5f2e3dc0cbbec98387770d43d3bdddf1f4d43e19..21d548bc7dfb475ad406f94d5e13f327b30b24c9 100644
--- a/appengine/swarming/test_env_handlers.py
+++ b/appengine/swarming/test_env_handlers.py
@@ -27,12 +27,17 @@ 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):
@@ -218,11 +223,14 @@ class AppTestBase(test_case.TestCase):
 
   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'},
@@ -231,18 +239,20 @@ class AppTestBase(test_case.TestCase):
       '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']