Merge "Utilizes assertIn - tests/api/etc"

10 files changed, 54 insertions, 54 deletions

diff --git a/nova/tests/api/ec2/test_api.py b/nova/tests/api/ec2/test_api.py
index e0a00b56f8..3d9a8099bf 100644
--- a/nova/tests/api/ec2/test_api.py
+++ b/nova/tests/api/ec2/test_api.py
@@ -307,8 +307,8 @@ class ApiEc2TestCase(test.TestCase):
         # Any request should be fine
         self.ec2.get_all_instances()
         self.assertTrue(self.ec2.APIVersion in self.http.getresponsebody(),
-                       'The version in the xmlns of the response does '
-                       'not match the API version given in the request.')
+                        'The version in the xmlns of the response does '
+                        'not match the API version given in the request.')
 
     def test_describe_instances(self):
         """Test that, after creating a user and a project, the describe
@@ -381,7 +381,7 @@ class ApiEc2TestCase(test.TestCase):
 
         rv = self.ec2.get_all_security_groups()
         self.assertEquals(len(rv), 2)
-        self.assertTrue(security_group_name in [group.name for group in rv])
+        self.assertIn(security_group_name, [group.name for group in rv])
 
         self.expect_http()
         self.mox.ReplayAll()
diff --git a/nova/tests/api/ec2/test_cinder_cloud.py b/nova/tests/api/ec2/test_cinder_cloud.py
index c1d0e91ec6..fd5db9a15d 100644
--- a/nova/tests/api/ec2/test_cinder_cloud.py
+++ b/nova/tests/api/ec2/test_cinder_cloud.py
@@ -673,11 +673,11 @@ class CinderCloudTestCase(test.TestCase):
     def _assertImageSet(self, result, root_device_type, root_device_name):
         self.assertEqual(1, len(result['imagesSet']))
         result = result['imagesSet'][0]
-        self.assertTrue('rootDeviceType' in result)
+        self.assertIn('rootDeviceType', result)
         self.assertEqual(result['rootDeviceType'], root_device_type)
-        self.assertTrue('rootDeviceName' in result)
+        self.assertIn('rootDeviceName', result)
         self.assertEqual(result['rootDeviceName'], root_device_name)
-        self.assertTrue('blockDeviceMapping' in result)
+        self.assertIn('blockDeviceMapping', result)
 
         return result
 
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 4d4ba46e25..fefb1d2a65 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -559,7 +559,7 @@ class CloudTestCase(test.TestCase):
                            'ipRanges': [],
                            'toPort': 80}]
         for rule in expected_rules:
-            self.assertTrue(rule in actual_rules)
+            self.assertIn(rule, actual_rules)
 
         db.security_group_destroy(self.context, sec3['id'])
         db.security_group_destroy(self.context, sec2['id'])
@@ -1311,9 +1311,9 @@ class CloudTestCase(test.TestCase):
     def assertDictListUnorderedMatch(self, L1, L2, key):
         self.assertEqual(len(L1), len(L2))
         for d1 in L1:
-            self.assertTrue(key in d1)
+            self.assertIn(key, d1)
             for d2 in L2:
-                self.assertTrue(key in d2)
+                self.assertIn(key, d2)
                 if d1[key] == d2[key]:
                     self.assertThat(d1, matchers.DictMatches(d2))
 
@@ -1402,11 +1402,11 @@ class CloudTestCase(test.TestCase):
     def _assertImageSet(self, result, root_device_type, root_device_name):
         self.assertEqual(1, len(result['imagesSet']))
         result = result['imagesSet'][0]
-        self.assertTrue('rootDeviceType' in result)
+        self.assertIn('rootDeviceType', result)
         self.assertEqual(result['rootDeviceType'], root_device_type)
-        self.assertTrue('rootDeviceName' in result)
+        self.assertIn('rootDeviceName', result)
         self.assertEqual(result['rootDeviceName'], root_device_name)
-        self.assertTrue('blockDeviceMapping' in result)
+        self.assertIn('blockDeviceMapping', result)
 
         return result
 
@@ -2295,10 +2295,10 @@ class CloudTestCase(test.TestCase):
         created_image = self.cloud.describe_images(self.context,
                                                    ec2_ids)['imagesSet'][0]
 
-        self.assertTrue('blockDeviceMapping' in created_image)
+        self.assertIn('blockDeviceMapping', created_image)
         bdm = created_image['blockDeviceMapping'][0]
         self.assertEquals(bdm.get('deviceName'), 'sda1')
-        self.assertTrue('ebs' in bdm)
+        self.assertIn('ebs', bdm)
         self.assertEquals(bdm['ebs'].get('snapshotId'),
                           ec2utils.id_to_ec2_snap_id(snapshots[0]))
         self.assertEquals(created_image.get('kernelId'), 'aki-00000001')
diff --git a/nova/tests/api/openstack/compute/test_api.py b/nova/tests/api/openstack/compute/test_api.py
index 677904d9f7..e3a2394713 100644
--- a/nova/tests/api/openstack/compute/test_api.py
+++ b/nova/tests/api/openstack/compute/test_api.py
@@ -96,7 +96,7 @@ class APITest(test.NoDBTestCase):
         #api.application = raise_api_fault
         api = self._wsgi_app(raise_api_fault)
         resp = webob.Request.blank('/').get_response(api)
-        self.assertTrue('itemNotFound' in resp.body, resp.body)
+        self.assertIn('itemNotFound', resp.body)
         self.assertEqual(resp.status_int, 404, resp.body)
 
     def test_exceptions_are_converted_to_faults_exception(self):
@@ -107,7 +107,7 @@ class APITest(test.NoDBTestCase):
         #api.application = fail
         api = self._wsgi_app(fail)
         resp = webob.Request.blank('/').get_response(api)
-        self.assertTrue('{"computeFault' in resp.body, resp.body)
+        self.assertIn('{"computeFault', resp.body)
         self.assertEqual(resp.status_int, 500, resp.body)
 
     def test_exceptions_are_converted_to_faults_exception_xml(self):
@@ -118,7 +118,7 @@ class APITest(test.NoDBTestCase):
         #api.application = fail
         api = self._wsgi_app(fail)
         resp = webob.Request.blank('/.xml').get_response(api)
-        self.assertTrue('<computeFault' in resp.body, resp.body)
+        self.assertIn('<computeFault', resp.body)
         self.assertEqual(resp.status_int, 500, resp.body)
 
     def _do_test_exception_safety_reflected_in_faults(self, expose):
@@ -131,11 +131,11 @@ class APITest(test.NoDBTestCase):
 
         api = self._wsgi_app(fail)
         resp = webob.Request.blank('/').get_response(api)
-        self.assertTrue('{"computeFault' in resp.body, resp.body)
+        self.assertIn('{"computeFault', resp.body)
         expected = ('ExceptionWithSafety: some explanation' if expose else
                     'The server has either erred or is incapable '
                     'of performing the requested operation.')
-        self.assertTrue(expected in resp.body, resp.body)
+        self.assertIn(expected, resp.body)
         self.assertEqual(resp.status_int, 500, resp.body)
 
     def test_safe_exceptions_are_described_in_faults(self):
@@ -151,12 +151,12 @@ class APITest(test.NoDBTestCase):
 
         api = self._wsgi_app(fail)
         resp = webob.Request.blank('/').get_response(api)
-        self.assertTrue(msg in resp.body, resp.body)
+        self.assertIn(msg, resp.body)
         self.assertEqual(resp.status_int, exception_type.code, resp.body)
 
         if hasattr(exception_type, 'headers'):
             for (key, value) in exception_type.headers.iteritems():
-                self.assertTrue(key in resp.headers)
+                self.assertIn(key, resp.headers)
                 self.assertEquals(resp.headers[key], str(value))
 
     def test_quota_error_mapping(self):
diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py
index 865b5e99f3..43caa0c0f2 100644
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@@ -745,7 +745,7 @@ class DisabledFlavorsWithRealDBTest(test.TestCase):
         db_flavorids = set(i['flavorid'] for i in self.inst_types)
         disabled_flavorid = str(self.disabled_type['flavorid'])
 
-        self.assertTrue(disabled_flavorid in db_flavorids)
+        self.assertIn(disabled_flavorid, db_flavorids)
         self.assertEqual(db_flavorids - set([disabled_flavorid]),
                          api_flavorids)
 
@@ -758,7 +758,7 @@ class DisabledFlavorsWithRealDBTest(test.TestCase):
         db_flavorids = set(i['flavorid'] for i in self.inst_types)
         disabled_flavorid = str(self.disabled_type['flavorid'])
 
-        self.assertTrue(disabled_flavorid in db_flavorids)
+        self.assertIn(disabled_flavorid, db_flavorids)
         self.assertEqual(db_flavorids, api_flavorids)
 
     def test_show_should_include_disabled_flavor_for_user(self):
diff --git a/nova/tests/api/openstack/compute/test_image_metadata.py b/nova/tests/api/openstack/compute/test_image_metadata.py
index fd1a861d14..da00408205 100644
--- a/nova/tests/api/openstack/compute/test_image_metadata.py
+++ b/nova/tests/api/openstack/compute/test_image_metadata.py
@@ -42,7 +42,7 @@ class ImageMetaDataTest(test.TestCase):
     def test_show(self):
         req = fakes.HTTPRequest.blank('/v2/fake/images/123/metadata/key1')
         res_dict = self.controller.show(req, '123', 'key1')
-        self.assertTrue('meta' in res_dict)
+        self.assertIn('meta', res_dict)
         self.assertEqual(len(res_dict['meta']), 1)
         self.assertEqual('value1', res_dict['meta']['key1'])
 
diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py
index 86a7f5dd74..d77276e769 100644
--- a/nova/tests/api/openstack/compute/test_limits.py
+++ b/nova/tests/api/openstack/compute/test_limits.py
@@ -358,7 +358,7 @@ class LimitMiddlewareTest(BaseLimitTestSuite):
         response = request.get_response(self.app)
         self.assertEqual(response.status_int, 429)
 
-        self.assertTrue('Retry-After' in response.headers)
+        self.assertIn('Retry-After', response.headers)
         retry_after = int(response.headers['Retry-After'])
         self.assertAlmostEqual(retry_after, 60, 1)
 
@@ -367,7 +367,7 @@ class LimitMiddlewareTest(BaseLimitTestSuite):
         value = body["overLimit"]["details"].strip()
         self.assertEqual(value, expected)
 
-        self.assertTrue("retryAfter" in body["overLimit"])
+        self.assertIn("retryAfter", body["overLimit"])
         retryAfter = body["overLimit"]["retryAfter"]
         self.assertEqual(retryAfter, "60")
 
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index ae514bed17..145bdcdf05 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -206,7 +206,7 @@ class ServersControllerTest(ControllerTest):
         uuid = 'br-00000000-0000-0000-0000-000000000000'
         requested_networks = [{'uuid': uuid}]
         res = self.controller._get_requested_networks(requested_networks)
-        self.assertTrue((uuid, None) in res)
+        self.assertIn((uuid, None), res)
 
     def test_requested_networks_neutronv2_enabled_with_port(self):
         self.flags(network_api_class='nova.network.neutronv2.api.API')
@@ -642,7 +642,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('image' in search_opts)
+            self.assertIn('image', search_opts)
             self.assertEqual(search_opts['image'], '12345')
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
             return instance_obj._make_instance_list(
@@ -673,7 +673,7 @@ class ServersControllerTest(ControllerTest):
                                       use_admin_context=True)
         res = self.controller.index(req)
 
-        self.assertTrue('servers' in res)
+        self.assertIn('servers', res)
 
     def test_admin_restricted_tenant(self):
         def fake_get_all(context, filters=None, sort_key=None,
@@ -690,7 +690,7 @@ class ServersControllerTest(ControllerTest):
                                       use_admin_context=True)
         res = self.controller.index(req)
 
-        self.assertTrue('servers' in res)
+        self.assertIn('servers', res)
 
     def test_all_tenants_pass_policy(self):
         def fake_get_all(context, filters=None, sort_key=None,
@@ -715,7 +715,7 @@ class ServersControllerTest(ControllerTest):
         req = fakes.HTTPRequest.blank('/fake/servers?all_tenants=1')
         res = self.controller.index(req)
 
-        self.assertTrue('servers' in res)
+        self.assertIn('servers', res)
 
     def test_all_tenants_fail_policy(self):
         def fake_get_all(context, filters=None, sort_key=None,
@@ -746,7 +746,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('flavor' in search_opts)
+            self.assertIn('flavor', search_opts)
             # flavor is an integer ID
             self.assertEqual(search_opts['flavor'], '12345')
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
@@ -774,7 +774,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('vm_state' in search_opts)
+            self.assertIn('vm_state', search_opts)
             self.assertEqual(search_opts['vm_state'], vm_states.ACTIVE)
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
             return instance_obj._make_instance_list(
@@ -796,7 +796,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('task_state' in search_opts)
+            self.assertIn('task_state', search_opts)
             self.assertEqual(search_opts['task_state'], [task_state])
             db_list = [fakes.stub_instance(100, uuid=server_uuid,
                                                 task_state=task_state)]
@@ -830,7 +830,7 @@ class ServersControllerTest(ControllerTest):
         def fake_get_all(compute_self, context, search_opts=None,
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
-            self.assertTrue('vm_state' in search_opts)
+            self.assertIn('vm_state', search_opts)
             self.assertEqual(search_opts['vm_state'], 'deleted')
 
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
@@ -853,7 +853,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('name' in search_opts)
+            self.assertIn('name', search_opts)
             self.assertEqual(search_opts['name'], 'whee.*')
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
             return instance_obj._make_instance_list(
@@ -874,7 +874,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('changes-since' in search_opts)
+            self.assertIn('changes-since', search_opts)
             changes_since = datetime.datetime(2011, 1, 24, 17, 8, 1,
                                               tzinfo=iso8601.iso8601.UTC)
             self.assertEqual(search_opts['changes-since'], changes_since)
@@ -909,10 +909,10 @@ class ServersControllerTest(ControllerTest):
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
             # Allowed by user
-            self.assertTrue('name' in search_opts)
-            self.assertTrue('ip' in search_opts)
+            self.assertIn('name', search_opts)
+            self.assertIn('ip', search_opts)
             # OSAPI converts status to vm_state
-            self.assertTrue('vm_state' in search_opts)
+            self.assertIn('vm_state', search_opts)
             # Allowed only by admins with admin API on
             self.assertNotIn('unknown_option', search_opts)
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
@@ -940,12 +940,12 @@ class ServersControllerTest(ControllerTest):
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
             # Allowed by user
-            self.assertTrue('name' in search_opts)
+            self.assertIn('name', search_opts)
             # OSAPI converts status to vm_state
-            self.assertTrue('vm_state' in search_opts)
+            self.assertIn('vm_state', search_opts)
             # Allowed only by admins with admin API on
-            self.assertTrue('ip' in search_opts)
-            self.assertTrue('unknown_option' in search_opts)
+            self.assertIn('ip', search_opts)
+            self.assertIn('unknown_option', search_opts)
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
             return instance_obj._make_instance_list(
                 context, instance_obj.InstanceList(), db_list, FIELDS)
@@ -968,7 +968,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('ip' in search_opts)
+            self.assertIn('ip', search_opts)
             self.assertEqual(search_opts['ip'], '10\..*')
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
             return instance_obj._make_instance_list(
@@ -992,7 +992,7 @@ class ServersControllerTest(ControllerTest):
                          sort_key=None, sort_dir='desc',
                          limit=None, marker=None, want_objects=False):
             self.assertNotEqual(search_opts, None)
-            self.assertTrue('ip6' in search_opts)
+            self.assertIn('ip6', search_opts)
             self.assertEqual(search_opts['ip6'], 'ffff.*')
             db_list = [fakes.stub_instance(100, uuid=server_uuid)]
             return instance_obj._make_instance_list(
@@ -2195,7 +2195,7 @@ class ServersControllerCreateTest(test.TestCase):
         res = self.controller.create(self.req, self.body).obj
 
         server = res['server']
-        self.assertTrue('adminPass' in self.body['server'])
+        self.assertIn('adminPass', self.body['server'])
         self.assertNotIn('adminPass', server)
 
     def test_create_instance_admin_pass_empty(self):
diff --git a/nova/tests/api/openstack/test_faults.py b/nova/tests/api/openstack/test_faults.py
index 1dc06856ec..338b6fe08a 100644
--- a/nova/tests/api/openstack/test_faults.py
+++ b/nova/tests/api/openstack/test_faults.py
@@ -159,7 +159,7 @@ class TestFaults(test.NoDBTestCase):
         resp = req.get_response(raiser)
         self.assertEqual(resp.content_type, "application/xml")
         self.assertEqual(resp.status_int, 404)
-        self.assertTrue('whut?' in resp.body)
+        self.assertIn('whut?', resp.body)
 
     def test_raise_403(self):
         # Ensure the ability to raise :class:`Fault` in WSGI-ified methods.
@@ -172,7 +172,7 @@ class TestFaults(test.NoDBTestCase):
         self.assertEqual(resp.content_type, "application/xml")
         self.assertEqual(resp.status_int, 403)
         self.assertNotIn('resizeNotAllowed', resp.body)
-        self.assertTrue('forbidden' in resp.body)
+        self.assertIn('forbidden', resp.body)
 
     def test_raise_localize_explanation(self):
         msgid = "String with params: %s"
@@ -188,7 +188,7 @@ class TestFaults(test.NoDBTestCase):
         resp = req.get_response(raiser)
         self.assertEqual(resp.content_type, "application/xml")
         self.assertEqual(resp.status_int, 404)
-        self.assertTrue((msgid % params) in resp.body)
+        self.assertIn((msgid % params), resp.body)
 
     def test_fault_has_status_int(self):
         # Ensure the status_int is set correctly on faults.
@@ -203,7 +203,7 @@ class TestFaults(test.NoDBTestCase):
         fault = wsgi.Fault(webob.exc.HTTPBadRequest(explanation='scram'))
         response = request.get_response(fault)
 
-        self.assertTrue(common.XML_NS_V11 in response.body)
+        self.assertIn(common.XML_NS_V11, response.body)
         self.assertEqual(response.content_type, "application/xml")
         self.assertEqual(response.status_int, 400)
 
diff --git a/nova/tests/api/openstack/test_xmlutil.py b/nova/tests/api/openstack/test_xmlutil.py
index e1516d2fed..e763122ad5 100644
--- a/nova/tests/api/openstack/test_xmlutil.py
+++ b/nova/tests/api/openstack/test_xmlutil.py
@@ -215,7 +215,7 @@ class TemplateElementTest(test.NoDBTestCase):
         # Verify that the child was added
         self.assertEqual(len(elem), 1)
         self.assertEqual(elem[0], child)
-        self.assertEqual('child' in elem, True)
+        self.assertIn('child', elem)
         self.assertEqual(elem['child'], child)
 
         # Ensure that multiple children of the same name are rejected
@@ -243,7 +243,7 @@ class TemplateElementTest(test.NoDBTestCase):
         self.assertEqual(len(elem), 3)
         for idx in range(len(elem)):
             self.assertEqual(children[idx], elem[idx])
-            self.assertEqual(children[idx].tag in elem, True)
+            self.assertIn(children[idx].tag, elem)
             self.assertEqual(elem[children[idx].tag], children[idx])
 
         # Ensure that multiple children of the same name are rejected
@@ -285,7 +285,7 @@ class TemplateElementTest(test.NoDBTestCase):
         children.insert(1, child)
         for idx in range(len(elem)):
             self.assertEqual(children[idx], elem[idx])
-            self.assertEqual(children[idx].tag in elem, True)
+            self.assertIn(children[idx].tag, elem)
             self.assertEqual(elem[children[idx].tag], children[idx])
 
         # Ensure that multiple children of the same name are rejected