Add support for repeated keys in TaskRequest.

appengine/swarming/server/task_queues_test.py

Index: appengine/swarming/server/task_queues_test.py
diff --git a/appengine/swarming/server/task_queues_test.py b/appengine/swarming/server/task_queues_test.py
index 8cf983fcd9ce0e42b45380447c65d758c567b9ce..65a2971412d9839b7b0c3b40dd4726afa2a1dd94 100755
--- a/appengine/swarming/server/task_queues_test.py
+++ b/appengine/swarming/server/task_queues_test.py
@@ -46,17 +46,16 @@ 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,
@@ -238,7 +237,7 @@ class TaskQueuesApiTest(test_env_handlers.AppTestBase):
     # 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())
@@ -288,10 +287,10 @@ class TaskQueuesApiTest(test_env_handlers.AppTestBase):
     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)