swarming: custom cipd package paths

appengine/swarming/handlers_endpoints_test.py

 #!/usr/bin/env python
 # coding=utf-8
 # Copyright 2015 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 base64
 import datetime
 import json
 import logging
@@ skipping 136 matching lines @@
     self.mock_now(now)
     str_now = unicode(now.strftime(self.DATETIME_NO_MICRO))
     request = swarming_rpcs.NewTaskRequest(
         expiration_secs=30,
         name='job1',
         priority=200,
         properties=swarming_rpcs.TaskProperties(
             cipd_input=swarming_rpcs.CipdInput(
                 client_package=swarming_rpcs.CipdPackage(
                     package_name='infra/tools/cipd/${platform}',
-                    version='git_revision:deadbeef',
-                ),
+                    version='git_revision:deadbeef'),
                 packages=[
                   swarming_rpcs.CipdPackage(
                       package_name='rm', version='latest'),
                 ],
-                server='https://chrome-infra-packages.appspot.com',
-            ),
+                server='https://chrome-infra-packages.appspot.com'),
             command=['rm', '-rf', '/'],
             dimensions=[
               swarming_rpcs.StringPair(key='pool', value='default'),
             ],
             env=[
               swarming_rpcs.StringPair(key='PATH', value='/'),
             ],
             execution_timeout_secs=30,
             io_timeout_secs=30),
         tags=['foo:bar'],
@@ skipping 66 matching lines @@
 
     request = swarming_rpcs.NewTaskRequest(
         expiration_secs=30,
         name='job1',
         priority=200,
         properties=swarming_rpcs.TaskProperties(
             command=['python', 'run_test.py'],
             cipd_input=swarming_rpcs.CipdInput(
                 client_package=swarming_rpcs.CipdPackage(
                     package_name='infra/tools/cipd/${platform}',
-                    version='git_revision:deadbeef',
-                ),
+                    version='git_revision:deadbeef'),
                 packages=[
                   swarming_rpcs.CipdPackage(
                       package_name='rm',
+                      path='bin',
                       version='git_revision:deadbeef'),
                 ],
-                server='https://chrome-infra-packages.appspot.com',
-            ),
+                server='https://chrome-infra-packages.appspot.com'),
             dimensions=[
               swarming_rpcs.StringPair(key='os', value='Amiga'),
               swarming_rpcs.StringPair(key='pool', value='default'),
             ],
             execution_timeout_secs=3600,
             idempotent=True,
             io_timeout_secs=1200),
         tags=['foo:bar'],
         user='joe@localhost')
     expected = {
       u'request': {
         u'authenticated': u'user:user@example.com',
         u'created_ts': str_now_30,
         u'expiration_secs': u'30',
         u'name': u'job1',
         u'priority': u'200',
         u'properties': {
           u'cipd_input': {
             u'client_package': {
               u'package_name': u'infra/tools/cipd/${platform}',
               u'version': u'git_revision:deadbeef',
             },
             u'packages': [{
               u'package_name': u'rm',
-              u'version': 'git_revision:deadbeef',
+              u'path': u'bin',
+              u'version': u'git_revision:deadbeef',
             }],
             u'server': u'https://chrome-infra-packages.appspot.com',
           },
           u'command': [u'python', u'run_test.py'],
           u'dimensions': [
             {u'key': u'os', u'value': u'Amiga'},
             {u'key': u'pool', u'value': u'default'},
           ],
           u'execution_timeout_secs': u'3600',
           u'grace_period_secs': u'30',
@@ skipping 117 matching lines @@
           u'name': u'job1',
           u'priority': u'200',
           u'properties': {
             u'cipd_input': {
               u'client_package': {
                 u'package_name': u'infra/tools/cipd/${platform}',
                 u'version': u'git_revision:deadbeef',
               },
               u'packages': [{
                 u'package_name': u'rm',
-                u'version': 'git_revision:deadbeef',
+                u'path': u'bin',
+                u'version': u'git_revision:deadbeef',
               }],
               u'server': u'https://chrome-infra-packages.appspot.com',
             },
             u'command': [u'python', u'run_test.py'],
             u'dimensions': [
               {u'key': u'os', u'value': u'Amiga'},
               {u'key': u'pool', u'value': u'default'},
             ],
             u'execution_timeout_secs': u'3600',
             u'grace_period_secs': u'30',
@@ skipping 16 matching lines @@
           u'name': u'task',
           u'priority': u'10',
           u'properties': {
             u'cipd_input': {
               u'client_package': {
                 u'package_name': u'infra/tools/cipd/${platform}',
                 u'version': u'git_revision:deadbeef',
               },
               u'packages': [{
                 u'package_name': u'rm',
-                u'version': 'git_revision:deadbeef',
+                u'path': u'bin',
+                u'version': u'git_revision:deadbeef',
               }],
               u'server': u'https://chrome-infra-packages.appspot.com',
             },
             u'command': [u'python', u'run_test.py'],
             u'dimensions': [
               {u'key': u'os', u'value': u'Amiga'},
               {u'key': u'pool', u'value': u'default'},
             ],
             u'execution_timeout_secs': u'3600',
             u'grace_period_secs': u'30',
@@ skipping 141 matching lines @@
           u'priority:200',
           u'user:joe@localhost',
         ],
         u'user': u'joe@localhost',
       },
       u'task_id': u'5cee488008810',
     }
     response = self.call_api('new', body=message_to_dict(request))
     self.assertEqual(expected, response.json)
 
-  def test_new_cipd_packages_with_defaults(self):
+  def test_new_cipd_package_with_defaults(self):
     self.mock(random, 'getrandbits', lambda _: 0x88)
     now = datetime.datetime(2010, 1, 2, 3, 4, 5)
     self.mock_now(now)
     str_now = unicode(now.strftime(self.DATETIME_NO_MICRO))
 
     # Define settings on the server.
     cfg = config.settings()
     cfg.cipd.default_client_package.package_name = (
         'infra/tools/cipd/${platform}')
     cfg.cipd.default_client_package.version = 'git_revision:deadbeef'
@@ skipping 609 matching lines @@
       u'name': u'hi',
       u'priority': u'10',
       u'properties': {
         u'cipd_input': {
           u'client_package': {
             u'package_name': u'infra/tools/cipd/${platform}',
             u'version': u'git_revision:deadbeef',
           },
           u'packages': [{
             u'package_name': u'rm',
+            u'path': u'bin',
             u'version': 'git_revision:deadbeef',
           }],
           u'server': u'https://chrome-infra-packages.appspot.com',
         },
         u'command': [u'python', u'run_test.py'],
         u'dimensions': [
           {u'key': u'os', u'value': u'Amiga'},
           {u'key': u'pool', u'value': u'default'},
         ],
         u'execution_timeout_secs': u'3600',
@@ skipping 305 matching lines @@
     self.assertEqual(expected, response.json)
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
     logging.basicConfig(level=logging.DEBUG)
   else:
     logging.basicConfig(level=logging.CRITICAL)
   unittest.main()