Propagate name of system service account to the bot.

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 298 matching lines @@
         },
         u'env': {},
         u'extra_args': [],
         u'grace_period': 30,
         u'hard_timeout': 3600,
         u'host': u'http://localhost:8080',
         u'isolated': None,
         u'secret_bytes': None,
         u'io_timeout': 1200,
         u'outputs': [u'foo', u'path/to/foobar'],
-        u'service_account': u'none',
+        u'service_accounts': {
+          u'system': {u'service_account': u'none'},
+          u'task': {u'service_account': u'none'},
+        },
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
     response = self.client_get_results(task_id)
     expected = {
       u'bot_dimensions': [
         {u'key': u'id', u'value': [u'bot1']},
         {u'key': u'os', u'value': [u'Amiga']},
         {u'key': u'pool', u'value': [u'default']},
@@ skipping 48 matching lines @@
         },
         u'env': {},
         u'extra_args': [],
         u'grace_period': 30,
         u'hard_timeout': 3600,
         u'host': u'http://localhost:8080',
         u'isolated': None,
         u'secret_bytes': None,
         u'io_timeout': 1200,
         u'outputs': [u'foo', u'path/to/foobar'],
-        u'service_account': u'bot',
+        u'service_accounts': {
+          u'system': {u'service_account': u'none'},
+          u'task': {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({
       'caches': [{
@@ skipping 33 matching lines @@
         },
         u'env': {},
         u'extra_args': [],
         u'grace_period': 30,
         u'hard_timeout': 3600,
         u'host': u'http://localhost:8080',
         u'isolated': None,
         u'io_timeout': 1200,
         u'outputs': [u'foo', u'path/to/foobar'],
         u'secret_bytes': None,
-        u'service_account': u'none',
+        u'service_accounts': {
+          u'system': {u'service_account': u'none'},
+          u'task': {u'service_account': u'none'},
+        },
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
 
   def test_poll_conflicting_dimensions(self):
     params = self.do_handshake()
     self.assertEqual(params['dimensions']['pool'], ['default'])
 
     self.mock_bot_group_config(
@@ skipping 74 matching lines @@
         u'grace_period': 30,
         u'host': u'http://localhost:8080',
         u'isolated': {
           u'input': u'0123456789012345678901234567890123456789',
           u'server': u'http://localhost:1',
           u'namespace': u'default-gzip',
         },
         u'secret_bytes': None,
         u'io_timeout': 1200,
         u'outputs': [u'foo', u'path/to/foobar'],
-        u'service_account': u'none',
+        u'service_accounts': {
+          u'system': {u'service_account': u'none'},
+          u'task': {u'service_account': u'none'},
+        },
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
 
     # Complete the isolated task.
     params = {
       'cost_usd': 0.1,
       'duration': 3.,
       'bot_overhead': 0.1,
@@ skipping 138 matching lines @@
         u'grace_period': 30,
         u'host': u'http://localhost:8080',
         u'isolated': {
           u'input': u'0123456789012345678901234567890123456789',
           u'server': u'http://localhost:1',
           u'namespace': u'default-gzip',
         },
         u'secret_bytes': None,
         u'io_timeout': 1200,
         u'outputs': [u'foo', u'path/to/foobar'],
-        u'service_account': u'none',
+        u'service_accounts': {
+          u'system': {u'service_account': u'none'},
+          u'task': {u'service_account': u'none'},
+        },
         u'task_id': task_id,
       },
     }
     self.assertEqual(expected, response)
 
   def test_bot_ereporter2_error(self):
     # ereporter2's //client/utils/on_error.py traps unhandled exceptions
     # automatically.
     self.mock(random, 'getrandbits', lambda _: 0x88)
     errors = []
@@ skipping 619 matching lines @@
     self.assertEqual({u'service_account': u'none'}, response)
 
 
 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()