swarming: Fix named cache support.

client/tests/swarming_test.py

 #!/usr/bin/env python
 # Copyright 2013 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 datetime
 import json
 import logging
 import os
 import re
@@ skipping 72 matching lines @@
   return dispatcher.execute(swarming.OptionParserSwarming(), args)
 
 
 def gen_request_data(properties=None, **kwargs):
   out = {
     'expiration_secs': 3600,
     'name': 'unit_tests',
     'parent_task_id': '',
     'priority': 101,
     'properties': {
+      'caches': [],
       'cipd_input': None,
       'command': None,
       'dimensions': [
         {'key': 'foo', 'value': 'bar'},
         {'key': 'os', 'value': 'Mac'},
       ],
       'env': [],
       'execution_timeout_secs': 60,
       'extra_args': ['--some-arg', '123'],
       'grace_period_secs': 30,
@@ skipping 202 matching lines @@
 
 
 class TestSwarmingTrigger(NetTestCase):
   def test_trigger_task_shards_2_shards(self):
     task_request = swarming.NewTaskRequest(
         expiration_secs=60*60,
         name=TEST_NAME,
         parent_task_id=None,
         priority=101,
         properties=swarming.TaskProperties(
+            caches=[],
             cipd_input=None,
             command=['a', 'b'],
             dimensions={'foo': 'bar', 'os': 'Mac'},
             env={},
             execution_timeout_secs=60,
             extra_args=[],
             grace_period_secs=30,
             idempotent=False,
             inputs_ref=None,
             io_timeout_secs=60,
@@ skipping 50 matching lines @@
     }
     self.assertEqual(expected, tasks)
 
   def test_trigger_task_shards_priority_override(self):
     task_request = swarming.NewTaskRequest(
         expiration_secs=60*60,
         name=TEST_NAME,
         parent_task_id='123',
         priority=101,
         properties=swarming.TaskProperties(
+            caches=[],
             cipd_input=None,
             command=['a', 'b'],
             dimensions={'foo': 'bar', 'os': 'Mac'},
             env={},
             execution_timeout_secs=60,
             extra_args=[],
             grace_period_secs=30,
             idempotent=False,
             inputs_ref=None,
             io_timeout_secs=60,
@@ skipping 35 matching lines @@
     self.assertEqual(expected, tasks)
     self._check_output('', 'Priority was reset to 200\n')
 
   def test_trigger_cipd_package(self):
     task_request = swarming.NewTaskRequest(
         expiration_secs=60*60,
         name=TEST_NAME,
         parent_task_id='123',
         priority=101,
         properties=swarming.TaskProperties(
+            caches=[],
             cipd_input=swarming.CipdInput(
                 client_package=None,
                 packages=[
                     swarming.CipdPackage(
                         package_name='mypackage',
                         path='path/to/package',
                         version='abc123')],
                 server=None),
             command=['a', 'b'],
             dimensions={'foo': 'bar', 'os': 'Mac'},
@@ skipping 386 matching lines @@
     self.assertEqual(0, ret)
 
   def test_run_raw_cmd(self):
     # Minimalist use.
     request = {
       'expiration_secs': 21600,
       'name': u'None/foo=bar',
       'parent_task_id': '',
       'priority': 100,
       'properties': {
+        'caches': [],
         'cipd_input': None,
         'command': ['python', '-c', 'print(\'hi\')'],
         'dimensions': [
           {'key': 'foo', 'value': 'bar'},
         ],
         'env': [],
         'execution_timeout_secs': 3600,
         'extra_args': None,
         'grace_period_secs': 30,
         'idempotent': False,
@@ skipping 35 matching lines @@
         '')
 
   def test_run_raw_cmd_with_service_account(self):
     # Minimalist use.
     request = {
       'expiration_secs': 21600,
       'name': u'None/foo=bar',
       'parent_task_id': '',
       'priority': 100,
       'properties': {
+        'caches': [],
         'cipd_input': None,
         'command': ['python', '-c', 'print(\'hi\')'],
         'dimensions': [
           {'key': 'foo', 'value': 'bar'},
         ],
         'env': [],
         'execution_timeout_secs': 3600,
         'extra_args': None,
         'grace_period_secs': 30,
         'idempotent': False,
@@ skipping 166 matching lines @@
               'task_id': '12300',
               'view_url': 'https://localhost:1/user/task/12300',
             }
           },
           'request': {
             'expiration_secs': 3600,
             'name': 'unit_tests',
             'parent_task_id': '',
             'priority': 101,
             'properties': {
+              'caches': [],
               'cipd_input': None,
               'command': None,
               'dimensions': [
                 {'key': 'foo', 'value': 'bar'},
                 {'key': 'os', 'value': 'Mac'},
               ],
               'env': [],
               'execution_timeout_secs': 60,
               'extra_args': ['--some-arg', '123'],
               'grace_period_secs': 30,
@@ skipping 500 matching lines @@
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.CRITICAL)
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   for e in ('ISOLATE_SERVER', 'SWARMING_TASK_ID', 'SWARMING_SERVER'):
     os.environ.pop(e, None)
   unittest.main()