Add --output option to Swarming client and pass it through to the bot

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 85 matching lines @@
         {'key': 'foo', 'value': 'bar'},
         {'key': 'os', 'value': 'Mac'},
       ],
       'env': [],
       'execution_timeout_secs': 60,
       'extra_args': ['--some-arg', '123'],
       'grace_period_secs': 30,
       'idempotent': False,
       'inputs_ref': None,
       'io_timeout_secs': 60,
+      'outputs': [],
     },
     'tags': ['tag:a', 'tag:b'],
     'user': 'joe@localhost',
   }
   out.update(kwargs)
   out['properties'].update(properties or {})
   return out
 
 
 def gen_request_response(request, **kwargs):
@@ skipping 195 matching lines @@
         properties=swarming.TaskProperties(
             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),
+            io_timeout_secs=60,
+            outputs=[]),
         service_account_token=None,
         tags=['tag:a', 'tag:b'],
         user='joe@localhost')
 
     request_1 = swarming.task_request_to_raw_request(task_request, False)
     request_1['name'] = u'unit_tests:0:2'
     request_1['properties']['env'] = [
       {'key': 'GTEST_SHARD_INDEX', 'value': '0'},
       {'key': 'GTEST_TOTAL_SHARDS', 'value': '2'},
     ]
@@ skipping 47 matching lines @@
         properties=swarming.TaskProperties(
             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),
+            io_timeout_secs=60,
+            outputs=[]),
         service_account_token=None,
         tags=['tag:a', 'tag:b'],
         user='joe@localhost')
 
     request = swarming.task_request_to_raw_request(task_request, False)
     self.assertEqual('123', request['parent_task_id'])
 
     result = gen_request_response(request)
     result['request']['priority'] = 200
     self.expected_requests(
@@ skipping 39 matching lines @@
                         version='abc123')],
                 server=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),
+            io_timeout_secs=60,
+            outputs=[]),
         service_account_token=None,
         tags=['tag:a', 'tag:b'],
         user='joe@localhost')
 
     request = swarming.task_request_to_raw_request(task_request, False)
     expected = {
       'client_package': None,
       'packages': [{
           'package_name': 'mypackage',
           'path': 'path/to/package',
@@ skipping 379 matching lines @@
         'dimensions': [
           {'key': 'foo', 'value': 'bar'},
         ],
         'env': [],
         'execution_timeout_secs': 3600,
         'extra_args': None,
         'grace_period_secs': 30,
         'idempotent': False,
         'inputs_ref': None,
         'io_timeout_secs': 1200,
+        'outputs': [],
       },
       'tags': [],
       'user': None,
     }
     result = gen_request_response(request)
     self.expected_requests(
         [
           (
             'https://localhost:1/api/swarming/v1/tasks/new',
             {'data': request},
@@ skipping 33 matching lines @@
         'dimensions': [
           {'key': 'foo', 'value': 'bar'},
         ],
         'env': [],
         'execution_timeout_secs': 3600,
         'extra_args': None,
         'grace_period_secs': 30,
         'idempotent': False,
         'inputs_ref': None,
         'io_timeout_secs': 1200,
+        'outputs': [],
       },
       'service_account_token': 'bot',
       'tags': [],
       'user': None,
     }
     result = gen_request_response(request)
     self.expected_requests(
         [
           (
             'https://localhost:1/api/swarming/v1/tasks/new',
@@ skipping 167 matching lines @@
               'execution_timeout_secs': 60,
               'extra_args': ['--some-arg', '123'],
               'grace_period_secs': 30,
               'idempotent': True,
               'inputs_ref': {
                 'isolated': isolated_hash,
                 'isolatedserver': 'https://localhost:2',
                 'namespace': 'default-gzip',
                 },
               'io_timeout_secs': 60,
+              'outputs': [],
             },
             'tags': ['tag:a', 'tag:b'],
             'user': 'joe@localhost',
           },
         },
         True,
       ),
     ]
     self.assertEqual(expected, write_json_calls)
 
@@ skipping 478 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()