swarming: custom cipd package paths

appengine/swarming/server/task_request_test.py

 #!/usr/bin/env python
 # Copyright 2014 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 logging
 import random
 import sys
 import unittest
@@ skipping 31 matching lines @@
     return result
 
   cipd_input = properties.pop('cipd_input', {})
   cipd_input = merge(cipd_input, {
     'client_package': merge(cipd_input.pop('client_package', {}), {
       'package_name': 'infra/tools/cipd/${platform}',
       'version': 'git_revision:deadbeef',
     }),
     'packages': [{
       'package_name': 'rm',
+      'path': 'bin',
       'version': 'git_revision:deadbeef',
     }],
     'server': 'https://chrome-infra-packages.appspot.com'
   })
 
   inputs_ref = properties.pop('inputs_ref', {
     'isolatedserver': 'https://isolateserver.appspot.com',
     'namespace': 'default-gzip',
   })
 
@@ skipping 148 matching lines @@
     # Compare with test_make_request_clone().
     parent = mkreq(_gen_request())
     # Hack: Would need to know about TaskResultSummary.
     parent_id = task_pack.pack_request_key(parent.key) + '1'
     r = _gen_request(properties=dict(idempotent=True), parent_task_id=parent_id)
     request = mkreq(r)
     expected_properties = {
       'cipd_input': {
         'client_package': {
           'package_name': 'infra/tools/cipd/${platform}',
+          'path': None,
           'version': 'git_revision:deadbeef',
         },
         'packages': [{
           'package_name': 'rm',
+          'path': 'bin',
           'version': 'git_revision:deadbeef',
         }],
         'server': 'https://chrome-infra-packages.appspot.com'
       },
       'command': [u'command1', u'arg1'],
       'dimensions': {
         u'OS': u'Windows-3.1.1',
         u'hostname': u'localhost',
         u'pool': u'default',
       },
@@ skipping 10 matching lines @@
       'io_timeout_secs': None,
     }
     expected_request = {
       'authenticated': auth_testing.DEFAULT_MOCKED_IDENTITY,
       'name': u'Request name',
       'parent_task_id': unicode(parent_id),
       'priority': 49,
       'properties': expected_properties,
       # Intentionally hard code the hash value since it has to be deterministic.
       # Other unit tests should use the calculated value.
-      'properties_hash': 'c07adb3b577d51169036f29e44764a5ddf132228',
+      'properties_hash': '411f20b8cda819b5fe47bcf26f5566c37afce0ed',
       'pubsub_topic': None,
       'pubsub_userdata': None,
       'tags': [
         u'OS:Windows-3.1.1',
         u'hostname:localhost',
         u'pool:default',
         u'priority:49',
         u'tag:1',
         u'user:Jesus',
       ],
@@ skipping 15 matching lines @@
       },
     }))
     # Hack: Would need to know about TaskResultSummary.
     parent_id = task_pack.pack_request_key(parent.key) + '1'
     request = mkreq(_gen_request(
         properties={'idempotent':True}, parent_task_id=parent_id))
     expected_properties = {
       'cipd_input': {
         'client_package': {
           'package_name': 'infra/tools/cipd/${platform}',
+          'path': None,
           'version': 'git_revision:deadbeef',
         },
         'packages': [{
           'package_name': 'rm',
+          'path': 'bin',
           'version': 'git_revision:deadbeef',
         }],
         'server': 'https://chrome-infra-packages.appspot.com'
       },
       'command': [u'command1', u'arg1'],
       'dimensions': {
         u'OS': u'Windows-3.1.1',
         u'hostname': u'localhost',
         u'pool': u'default',
       },
@@ skipping 10 matching lines @@
       'io_timeout_secs': None,
     }
     expected_request = {
       'authenticated': auth_testing.DEFAULT_MOCKED_IDENTITY,
       'name': u'Request name',
       'parent_task_id': unicode(parent_id),
       'priority': 49,
       'properties': expected_properties,
       # Intentionally hard code the hash value since it has to be deterministic.
       # Other unit tests should use the calculated value.
-      'properties_hash': 'c07adb3b577d51169036f29e44764a5ddf132228',
+      'properties_hash': '411f20b8cda819b5fe47bcf26f5566c37afce0ed',
       'pubsub_topic': None,
       'pubsub_userdata': None,
       'tags': [
         u'OS:Windows-3.1.1',
         u'hostname:localhost',
         u'pool:default',
         u'priority:49',
         u'tag:1',
         u'user:Jesus',
       ],
@@ skipping 19 matching lines @@
       _gen_request(parent_task_id='1d69b9f088008810')
 
   def test_make_request_idempotent(self):
     request = mkreq(_gen_request(properties=dict(idempotent=True)))
     as_dict = request.to_dict()
     self.assertEqual(True, as_dict['properties']['idempotent'])
     # Intentionally hard code the hash value since it has to be deterministic.
     # Other unit tests should use the calculated value.
     # Ensure the algorithm is deterministic.
     self.assertEqual(
-        'c07adb3b577d51169036f29e44764a5ddf132228', as_dict['properties_hash'])
+        '411f20b8cda819b5fe47bcf26f5566c37afce0ed', as_dict['properties_hash'])
 
   def test_duped(self):
     # Two TestRequest with the same properties.
     request_1 = mkreq(_gen_request(properties=dict(idempotent=True)))
     now = utils.utcnow()
     request_2 = mkreq(_gen_request(
         name='Other',
         user='Other',
         priority=201,
         created_ts=now,
@@ skipping 147 matching lines @@
     data = _gen_request(
         properties=dict(idempotent=True), parent_task_id=parent_id)
     request = task_request.make_request_clone(mkreq(data))
     # Differences from make_request() are:
     # - idempotent was reset to False.
     # - parent_task_id was reset to None.
     expected_properties = {
       'cipd_input': {
         'client_package': {
           'package_name': 'infra/tools/cipd/${platform}',
+          'path': None,
           'version': 'git_revision:deadbeef',
         },
         'packages': [{
           'package_name': 'rm',
+          'path': 'bin',
           'version': 'git_revision:deadbeef',
         }],
         'server': 'https://chrome-infra-packages.appspot.com'
       },
       'command': [u'command1', u'arg1'],
       'dimensions': {
         u'OS': u'Windows-3.1.1',
         u'hostname': u'localhost',
         u'pool': u'default',
       },
@@ skipping 75 matching lines @@
         ndb.Key(task_request.TaskRequest, 0x7f14acec2fcfffff),
         task_request.request_id_to_key(0xeb5313d0300000))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.ERROR)
   unittest.main()