Add support for repeated keys in TaskRequest.

appengine/swarming/server/task_queues_test.py

 #!/usr/bin/env python
 # Copyright 2017 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 hashlib
 import logging
 import os
 import sys
@@ skipping 28 matching lines @@
   bot_management.bot_event(
       'bot_connected', u'bot1', '1.2.3.4', 'bot1', bot_dimensions, {},
       '1234', False, None, None)
   task_queues.assert_bot(bot_dimensions)
 
 
 def _gen_request(properties=None):
   """Creates a TaskRequest that expires in 24h."""
   props = {
     'command': [u'command1'],
-    'dimensions': {
-      u'cpu': u'x86-64',
-      u'os': u'Ubuntu-16.04',
-      u'pool': u'default',
-    },
+    'dimensions_flat': [
+      u'cpu:x86-64',
+      u'os:Ubuntu-16.04',
+      u'pool:default',
+    ],
     'env': {},
     'execution_timeout_secs': 24*60*60,
     'io_timeout_secs': None,
   }
   props.update(properties or {})
-  props['dimensions_dict'] = props.pop('dimensions')
   now = utils.utcnow()
   args = {
     'created_ts': now,
     'name': 'Request name',
     'priority': 50,
     'properties': task_request.TaskProperties(**props),
     'expiration_ts': now + datetime.timedelta(seconds=60),
     'tags': [u'tag:1'],
     'user': 'Jesus',
   }
@@ skipping 161 matching lines @@
     _assert_bot()
     self.assert_count(1, task_queues.BotDimensions)
     self.assert_count(1, task_queues.BotTaskDimensions)
     self.assert_count(1, task_queues.TaskDimensions)
     self.assertEqual([2980491642], task_queues.get_queues(u'bot1'))
 
   def test_assert_bot_then_task_with_id(self):
     # Assert a task that includes an 'id' dimension. No task queue is triggered
     # in this case, rebuild_task_cache() is called inlined.
     _assert_bot()
-    request = _gen_request(properties={u'dimensions': {u'id': u'bot1'}})
+    request = _gen_request(properties={u'dimensions_flat': [u'id:bot1']})
     task_request.init_new_request(request, True, None)
     task_queues.assert_task(request)
     self.assertEqual(0, self.execute_tasks())
     self.assert_count(1, bot_management.BotInfo)
     self.assert_count(1, task_queues.BotDimensions)
     self.assert_count(1, task_queues.BotTaskDimensions)
     self.assert_count(1, task_queues.TaskDimensions)
 
   def test_cleanup_after_bot(self):
     _assert_bot()
@@ skipping 29 matching lines @@
 
     # TaskDimension expired. The fact that the bot changed dimensions after an
     # hour didn't impact BotTaskDimensions expiration.
     self.mock_now(now, exp.total_seconds() + 1)
     _assert_bot()
     self.assert_count(1, task_queues.BotTaskDimensions)
     self.assert_count(1, task_queues.TaskDimensions)
     self.assertEqual([], task_queues.get_queues(u'bot1'))
 
   def test_hash_dimensions(self):
-    with self.assertRaises(AttributeError):
+    with self.assertRaises(AssertionError):
       task_queues.hash_dimensions('this is not json')
     # Assert it doesn't return 0.
-    self.assertEqual(3649838548, task_queues.hash_dimensions({}))
+    self.assertEqual(3649838548, task_queues.hash_dimensions([]))
 
   def test_tidy_stale(self):
     now = datetime.datetime(2010, 1, 2, 3, 4, 5)
     self.mock_now(now)
     _assert_bot()
     request = self._assert_task()
     exp = (request.expiration_ts-request.created_ts) + task_queues._ADVANCE
     self.assert_count(1, task_queues.BotTaskDimensions)
     self.assert_count(1, task_queues.TaskDimensions)
     self.assertEqual([2980491642], task_queues.get_queues(u'bot1'))
@@ skipping 18 matching lines @@
     self.assert_count(0, task_queues.TaskDimensions)
     self.assertEqual([], task_queues.get_queues(u'bot1'))
 
 
 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()