swarming: add transaction_id to tasks.new request

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 254 matching lines @@
 
   def test_poll_task_raw(self):
     # Successfully poll a task.
     self.mock(random, 'getrandbits', lambda _: 0x88)
     now = datetime.datetime(2010, 1, 2, 3, 4, 5)
     self.mock_now(now)
     str_now = unicode(now.strftime(DATETIME_FORMAT))
     # A bot polls, gets a task, updates it, completes it.
     params = self.do_handshake()
     # Enqueue a task.
-    _, task_id = self.client_create_task_raw()
+    _, _, task_id = self.client_create_task_raw()
     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'caches': [],
         u'cipd_input': {
@@ skipping 48 matching lines @@
       u'started_ts': str_now,
       u'state': u'RUNNING',
       u'task_id': u'5cee488008811',
       u'try_number': u'1',
     }
     self.assertEqual(expected, response)
 
   def test_poll_task_with_bot_service_account(self):
     params = self.do_handshake()
 
-    _, task_id = self.client_create_task_raw(service_account_token='bot')
+    _, _, task_id = self.client_create_task_raw(service_account_token='bot')
     self.assertEqual('0', task_id[-1])
     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'caches': [],
         u'cipd_input': {
@@ skipping 25 matching lines @@
         u'outputs': [u'foo', u'path/to/foobar'],
         u'service_account': u'bot',
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
 
   def test_poll_task_with_caches(self):
     params = self.do_handshake()
 
-    _, task_id = self.client_create_task_raw({
+    _, _, task_id = self.client_create_task_raw({
       'caches': [{
         'name': 'git_infra',
         'path': 'git_cache',
       }],
     })
     self.assertEqual('0', task_id[-1])
     task_id = task_id[:-1] + '1'
 
     response = self.post_json('/swarming/api/v1/bot/poll', params)
     expected = {
@@ skipping 94 matching lines @@
 
   def test_complete_task_isolated(self):
     # Successfully poll a task.
     self.mock(random, 'getrandbits', lambda _: 0x88)
     now = datetime.datetime(2010, 1, 2, 3, 4, 5)
     self.mock_now(now)
     str_now = unicode(now.strftime(DATETIME_FORMAT))
     # A bot polls, gets a task, updates it, completes it.
     params = self.do_handshake()
     # Enqueue a task.
-    _, task_id = self.client_create_task_isolated()
+    _, _, task_id = self.client_create_task_isolated()
     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'caches': [],
         u'cipd_input': {
@@ skipping 115 matching lines @@
       u'server_versions': [u'v1a'],
       u'started_ts': str_now,
       u'state': u'COMPLETED',
       u'task_id': u'5cee488008811',
       u'try_number': u'1',
     }
     self.assertEqual(expected, response)
 
   def test_poll_not_enough_time(self):
     # Make sure there's a task that we don't get.
-    _, task_id = self.client_create_task_raw()
+    _, _, task_id = self.client_create_task_raw()
     self.assertEqual('0', task_id[-1])
     params = self.do_handshake()
     bot_info = bot_management.get_info_key('bot1').get()
     bot_info.lease_expiration_ts = datetime.datetime(1969, 1, 1)
     bot_info.put()
     response = self.post_json('/swarming/api/v1/bot/poll', params)
     expected = {
       u'cmd': u'sleep',
       u'quarantined': False,
     }
     self.assertTrue(response.pop('duration'))
     self.assertEqual(expected, response)
 
   def test_poll_enough_time(self):
     # Successfully poll a task.
     self.mock(random, 'getrandbits', lambda _: 0x88)
     now = datetime.datetime(2010, 1, 2, 3, 4, 5)
     self.mock_now(now)
-    _, task_id = self.client_create_task_isolated()
+    _, _, task_id = self.client_create_task_isolated()
     self.assertEqual('0', task_id[-1])
     params = self.do_handshake()
     bot_info = bot_management.get_info_key('bot1').get()
     bot_info.lease_expiration_ts = datetime.datetime(3000, 1, 1)
     bot_info.put()
     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',
@@ skipping 479 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()