swarming: custom cipd package paths

appengine/swarming/handlers_bot_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 logging
 import os
@@ skipping 221 matching lines @@
     self.assertEqual('0', task_id[-1])
     # Convert TaskResultSummary reference to TaskRunResult.
     task_id = task_id[:-1] + '1'
     response = self.post_json('/swarming/api/v1/bot/poll', params)
     expected = {
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
         u'cipd_input': {
           u'client_package': {
-            u'package_name': 'infra/tools/cipd/${platform}',
-            u'version': 'git_revision:deadbeef',
+            u'package_name': u'infra/tools/cipd/${platform}',
+            u'path': None,
+            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': 'https://chrome-infra-packages.appspot.com',
+          u'server': u'https://chrome-infra-packages.appspot.com',
         },
         u'command': [u'python', u'run_test.py'],
         u'dimensions': {
           u'os': u'Amiga',
           u'pool': u'default',
         },
         u'env': {},
         u'extra_args': [],
         u'grace_period': 30,
         u'hard_timeout': 3600,
@@ skipping 40 matching lines @@
     self.assertEqual('0', task_id[-1])
     # Convert TaskResultSummary reference to TaskRunResult.
     task_id = task_id[:-1] + '1'
     response = self.post_json('/swarming/api/v1/bot/poll', params)
     expected = {
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
         u'cipd_input': {
           u'client_package': {
-            u'package_name': 'infra/tools/cipd/${platform}',
-            u'version': 'git_revision:deadbeef',
+            u'package_name': u'infra/tools/cipd/${platform}',
+            u'path': None,
+            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': 'https://chrome-infra-packages.appspot.com',
+          u'server': u'https://chrome-infra-packages.appspot.com',
         },
         u'command': None,
         u'dimensions': {
           u'os': u'Amiga',
           u'pool': u'default',
         },
         u'env': {},
         u'extra_args': [],
         u'hard_timeout': 3600,
         u'grace_period': 30,
@@ skipping 99 matching lines @@
         int(utils.time_time()) + 3600 + 1200 + 3 * 30 + 10 + 1)
     response = self.post_json('/swarming/api/v1/bot/poll', params)
     # Convert TaskResultSummary reference to TaskRunResult.
     task_id = task_id[:-1] + '1'
     expected = {
       u'cmd': u'run',
       u'manifest': {
         u'bot_id': u'bot1',
         u'cipd_input': {
           u'client_package': {
-            u'package_name': 'infra/tools/cipd/${platform}',
-            u'version': 'git_revision:deadbeef',
+            u'package_name': u'infra/tools/cipd/${platform}',
+            u'path': None,
+            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': 'https://chrome-infra-packages.appspot.com',
+          u'server': u'https://chrome-infra-packages.appspot.com',
         },
         u'command': None,
         u'dimensions': {
           u'os': u'Amiga',
           u'pool': u'default',
         },
         u'env': {},
         u'extra_args': [],
         u'hard_timeout': 3600,
         u'grace_period': 30,
@@ skipping 433 matching lines @@
     self.app.get('/bot_code?tok=%s' % tok, status=200)
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     unittest.TestCase.maxDiff = None
   logging.basicConfig(
       level=logging.DEBUG if '-v' in sys.argv else logging.CRITICAL,
       format='%(levelname)-7s %(filename)s:%(lineno)3d %(message)s')
   unittest.main()