Refactor method of constructing dicts in some tests

In some of the v2 tests, dictionaries are construed from lists of
tuples of length two. For example:

    dict([('visibility', 'private')])

There could be a very good reason for doing it that way, but it eludes
me. This patch replaces those with dictionary literals.

Change-Id: Ie9668bd681538ef41521f08a20cb8c3417ac91e8

tests/v2/test_images.py

@@ -403,33 +403,33 @@ class TestController(testtools.TestCase):
         self.assertEqual('image-2', images[1].name)
 
     def test_list_images_visibility_public(self):
-        filters = {'filters': dict([('visibility', 'public')])}
+        filters = {'filters': {'visibility': 'public'}}
         images = list(self.controller.list(**filters))
         self.assertEqual(_PUBLIC_ID, images[0].id)
 
     def test_list_images_visibility_private(self):
-        filters = {'filters': dict([('visibility', 'private')])}
+        filters = {'filters': {'visibility': 'private'}}
         images = list(self.controller.list(**filters))
         self.assertEqual(_PRIVATE_ID, images[0].id)
 
     def test_list_images_visibility_shared(self):
-        filters = {'filters': dict([('visibility', 'shared')])}
+        filters = {'filters': {'visibility': 'shared'}}
         images = list(self.controller.list(**filters))
         self.assertEqual(_SHARED_ID, images[0].id)
 
     def test_list_images_member_status_rejected(self):
-        filters = {'filters': dict([('member_status', 'rejected')])}
+        filters = {'filters': {'member_status': 'rejected'}}
         images = list(self.controller.list(**filters))
         self.assertEqual(_STATUS_REJECTED_ID, images[0].id)
 
     def test_list_images_for_owner(self):
-        filters = {'filters': dict([('owner', _OWNER_ID)])}
+        filters = {'filters': {'owner': _OWNER_ID}}
         images = list(self.controller.list(**filters))
         self.assertEqual(_OWNED_IMAGE_ID, images[0].id)
 
     def test_list_images_for_checksum_single_image(self):
         fake_id = '3a4560a1-e585-443e-9b39-553b46ec92d1'
-        filters = {'filters': dict([('checksum', _CHKSUM)])}
+        filters = {'filters': {'checksum': _CHKSUM}}
         images = list(self.controller.list(**filters))
         self.assertEqual(1, len(images))
         self.assertEqual('%s' % fake_id, images[0].id)
@@ -437,26 +437,26 @@ class TestController(testtools.TestCase):
     def test_list_images_for_checksum_multiple_images(self):
         fake_id1 = '2a4560b2-e585-443e-9b39-553b46ec92d1'
         fake_id2 = '6f99bf80-2ee6-47cf-acfe-1f1fabb7e810'
-        filters = {'filters': dict([('checksum', _CHKSUM1)])}
+        filters = {'filters': {'checksum': _CHKSUM1}}
         images = list(self.controller.list(**filters))
         self.assertEqual(2, len(images))
         self.assertEqual('%s' % fake_id1, images[0].id)
         self.assertEqual('%s' % fake_id2, images[1].id)
 
     def test_list_images_for_wrong_checksum(self):
-        filters = {'filters': dict([('checksum', 'wrong')])}
+        filters = {'filters': {'checksum': 'wrong'}}
         images = list(self.controller.list(**filters))
         self.assertEqual(0, len(images))
 
     def test_list_images_for_bogus_owner(self):
-        filters = {'filters': dict([('owner', _BOGUS_ID)])}
+        filters = {'filters': {'owner': _BOGUS_ID}}
         images = list(self.controller.list(**filters))
         self.assertEqual([], images)
 
     def test_list_images_for_bunch_of_filters(self):
-        filters = {'filters': dict([('owner', _BOGUS_ID),
+        filters = {'filters': {'owner': _BOGUS_ID,
-                                    ('visibility', 'shared'),
+                               'visibility': 'shared',
-                                    ('member_status', 'pending')])}
+                               'member_status': 'pending'}}
         images = list(self.controller.list(**filters))
         self.assertEqual(_EVERYTHING_ID, images[0].id)
 
@@ -477,7 +477,7 @@ class TestController(testtools.TestCase):
 
     def test_list_images_for_tag_single_image(self):
         img_id = '3a4560a1-e585-443e-9b39-553b46ec92d1'
-        filters = {'filters': dict([('tag', [_TAG1])])}
+        filters = {'filters': {'tag': [_TAG1]}}
         images = list(self.controller.list(**filters))
         self.assertEqual(1, len(images))
         self.assertEqual('%s' % img_id, images[0].id)
@@ -486,7 +486,7 @@ class TestController(testtools.TestCase):
     def test_list_images_for_tag_multiple_images(self):
         img_id1 = '2a4560b2-e585-443e-9b39-553b46ec92d1'
         img_id2 = '6f99bf80-2ee6-47cf-acfe-1f1fabb7e810'
-        filters = {'filters': dict([('tag', [_TAG2])])}
+        filters = {'filters': {'tag': [_TAG2]}}
         images = list(self.controller.list(**filters))
         self.assertEqual(2, len(images))
         self.assertEqual('%s' % img_id1, images[0].id)
@@ -494,13 +494,13 @@ class TestController(testtools.TestCase):
 
     def test_list_images_for_multi_tags(self):
         img_id1 = '2a4560b2-e585-443e-9b39-553b46ec92d1'
-        filters = {'filters': dict([('tag', [_TAG1, _TAG2])])}
+        filters = {'filters': {'tag': [_TAG1, _TAG2]}}
         images = list(self.controller.list(**filters))
         self.assertEqual(1, len(images))
         self.assertEqual('%s' % img_id1, images[0].id)
 
     def test_list_images_for_non_existent_tag(self):
-        filters = {'filters': dict([('tag', ['fake'])])}
+        filters = {'filters': {'tag': ['fake']}}
         images = list(self.controller.list(**filters))
         self.assertEqual(0, len(images))
 

tests/v2/test_tasks.py

@@ -221,32 +221,32 @@ class TestController(testtools.TestCase):
         self.assertEqual(tasks[1].type, 'import')
 
     def test_list_tasks_with_status(self):
-        filters = {'filters': dict([('status', 'processing')])}
+        filters = {'filters': {'status': 'processing'}}
         tasks = list(self.controller.list(**filters))
         self.assertEqual(tasks[0].id, _OWNED_TASK_ID)
 
     def test_list_tasks_with_wrong_status(self):
-        filters = {'filters': dict([('status', 'fake')])}
+        filters = {'filters': {'status': 'fake'}}
         tasks = list(self.controller.list(**filters))
         self.assertEqual(len(tasks), 0)
 
     def test_list_tasks_with_type(self):
-        filters = {'filters': dict([('type', 'import')])}
+        filters = {'filters': {'type': 'import'}}
         tasks = list(self.controller.list(**filters))
         self.assertEqual(tasks[0].id, _OWNED_TASK_ID)
 
     def test_list_tasks_with_wrong_type(self):
-        filters = {'filters': dict([('type', 'fake')])}
+        filters = {'filters': {'type': 'fake'}}
         tasks = list(self.controller.list(**filters))
         self.assertEqual(len(tasks), 0)
 
     def test_list_tasks_for_owner(self):
-        filters = {'filters': dict([('owner', _OWNER_ID)])}
+        filters = {'filters': {'owner': _OWNER_ID}}
         tasks = list(self.controller.list(**filters))
         self.assertEqual(tasks[0].id, _OWNED_TASK_ID)
 
     def test_list_tasks_for_fake_owner(self):
-        filters = {'filters': dict([('owner', _FAKE_OWNER_ID)])}
+        filters = {'filters': {'owner': _FAKE_OWNER_ID}}
         tasks = list(self.controller.list(**filters))
         self.assertEqual(tasks, [])