Merge "Replace assert* with more suitable asserts in unit tests"

glance/tests/unit/api/test_cmd_cache_manage.py

@@ -114,8 +114,8 @@ def test_queue_image_not_forced_confirmed(self, mock_client, mock_confirm):
         self.assertEqual(cache_manage.queue_image(mock_options, ['img_id']),
                          cache_manage.SUCCESS)
         self.assertTrue(mock_client.called)
-        self.assertTrue(
-            mock.call.mock_client().queue_image_for_caching('img_id') in
+        self.assertIn(
+            mock.call.mock_client().queue_image_for_caching('img_id'),
             manager.mock_calls)
 
     def test_delete_cached_image_without_index(self):
@@ -154,8 +154,8 @@ def test_delete_cached_image_not_forced_confirmed(self, mock_client,
             cache_manage.delete_cached_image(mock_options, ['img_id']),
             cache_manage.SUCCESS)
 
-        self.assertTrue(
-            mock.call.mock_client().delete_cached_image('img_id') in
+        self.assertIn(
+            mock.call.mock_client().delete_cached_image('img_id'),
             manager.mock_calls)
 
     @mock.patch.object(glance.cmd.cache_manage, 'user_confirm')
@@ -190,8 +190,8 @@ def test_delete_cached_images_not_forced_confirmed(self, mock_client,
             cache_manage.delete_all_cached_images(mock_options, None),
             cache_manage.SUCCESS)
         self.assertTrue(mock_client.called)
-        self.assertTrue(
-            mock.call.mock_client().delete_all_cached_images() in
+        self.assertIn(
+            mock.call.mock_client().delete_all_cached_images(),
             manager.mock_calls)
 
     def test_delete_queued_image_without_index(self):
@@ -230,8 +230,8 @@ def test_delete_queued_image_not_forced_confirmed(self, mock_client,
             cache_manage.delete_queued_image(mock_options, ['img_id']),
             cache_manage.SUCCESS)
         self.assertTrue(mock_client.called)
-        self.assertTrue(
-            mock.call.mock_client().delete_queued_image('img_id') in
+        self.assertIn(
+            mock.call.mock_client().delete_queued_image('img_id'),
             manager.mock_calls)
 
     @mock.patch.object(glance.cmd.cache_manage, 'user_confirm')
@@ -265,8 +265,8 @@ def test_delete_queued_images_not_forced_confirmed(self, mock_client,
             cache_manage.delete_all_queued_images(mock_options, None),
             cache_manage.SUCCESS)
         self.assertTrue(mock_client.called)
-        self.assertTrue(
-            mock.call.mock_client().delete_all_queued_images() in
+        self.assertIn(
+            mock.call.mock_client().delete_all_queued_images(),
             manager.mock_calls)
 
     @mock.patch.object(glance.cmd.cache_manage, 'get_client')

glance/tests/unit/api/test_property_protections.py

@@ -76,7 +76,7 @@ def test_get_image(self):
         self.assertEqual(result_extra_props['spl_read_prop'], 'r')
         self.assertEqual(result_extra_props['spl_update_prop'], 'u')
         self.assertEqual(result_extra_props['spl_delete_prop'], 'd')
-        self.assertFalse('forbidden' in result_extra_props.keys())
+        self.assertNotIn('forbidden', result_extra_props.keys())
 
     def test_list_image(self):
         result_images = self.image_repo.list()
@@ -86,14 +86,14 @@ def test_list_image(self):
         self.assertEqual(result_extra_props['spl_read_prop'], 'r')
         self.assertEqual(result_extra_props['spl_update_prop'], 'u')
         self.assertEqual(result_extra_props['spl_delete_prop'], 'd')
-        self.assertFalse('forbidden' in result_extra_props.keys())
+        self.assertNotIn('forbidden', result_extra_props.keys())
 
         result_extra_props = result_images[1].extra_properties
         self.assertEqual(result_extra_props, {})
 
         result_extra_props = result_images[2].extra_properties
         self.assertEqual(result_extra_props['spl_read_prop'], 'r')
-        self.assertFalse('forbidden' in result_extra_props.keys())
+        self.assertNotIn('forbidden', result_extra_props.keys())
 
 
 class TestProtectedImageProxy(utils.BaseTestCase):
@@ -116,7 +116,7 @@ def test_read_image_with_extra_prop(self):
             image, context, self.property_rules)
         result_extra_props = result_image.extra_properties
         self.assertEqual(result_extra_props['spl_read_prop'], 'read')
-        self.assertFalse('spl_fake_prop' in result_extra_props.keys())
+        self.assertNotIn('spl_fake_prop', result_extra_props.keys())
 
 
 class TestExtraPropertiesProxy(utils.BaseTestCase):

glance/tests/unit/common/test_exception.py

@@ -29,7 +29,7 @@ class FakeGlanceException(exception.GlanceException):
         self.assertEqual(unicode(exc), 'default message')
 
     def test_specified_error_msg(self):
-        self.assertTrue('test' in unicode(exception.GlanceException('test')))
+        self.assertIn('test', unicode(exception.GlanceException('test')))
 
     def test_default_error_msg_with_kwargs(self):
         class FakeGlanceException(exception.GlanceException):
@@ -39,9 +39,9 @@ class FakeGlanceException(exception.GlanceException):
         self.assertEqual(unicode(exc), "default message: 500")
 
     def test_specified_error_msg_with_kwargs(self):
-        self.assertTrue('test: 500' in
-                        unicode(exception.GlanceException('test: %(code)s',
-                                                          code=500)))
+        self.assertIn('test: 500',
+                      unicode(exception.GlanceException('test: %(code)s',
+                                                        code=500)))
 
     def test_non_unicode_error_msg(self):
         exc = exception.GlanceException(str('test'))

glance/tests/unit/common/test_rpc.py

@@ -307,7 +307,7 @@ def test_has_body_has_content_length(self):
         request = wsgi.Request.blank('/')
         request.method = 'POST'
         request.body = 'asdf'
-        self.assertTrue('Content-Length' in request.headers)
+        self.assertIn('Content-Length', request.headers)
         self.assertTrue(rpc.RPCJSONDeserializer().has_body(request))
 
     def test_no_body_no_content_length(self):
@@ -344,7 +344,7 @@ def test_has_body_has_transfer_encoding(self):
         request.method = 'POST'
         request.body = 'fake_body'
         request.headers['transfer-encoding'] = 0
-        self.assertTrue('transfer-encoding' in request.headers)
+        self.assertIn('transfer-encoding', request.headers)
         self.assertTrue(rpc.RPCJSONDeserializer().has_body(request))
 
     def test_to_json_with_date_format_value(self):

glance/tests/unit/common/test_wsgi.py

@@ -334,7 +334,7 @@ def test_has_body_has_content_length(self):
         request = wsgi.Request.blank('/')
         request.method = 'POST'
         request.body = 'asdf'
-        self.assertTrue('Content-Length' in request.headers)
+        self.assertIn('Content-Length', request.headers)
         self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
 
     def test_no_body_no_content_length(self):
@@ -371,7 +371,7 @@ def test_has_body_has_transfer_encoding(self):
         request.method = 'POST'
         request.body = 'fake_body'
         request.headers['transfer-encoding'] = 0
-        self.assertTrue('transfer-encoding' in request.headers)
+        self.assertIn('transfer-encoding', request.headers)
         self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
 
     def test_get_bind_addr_default_value(self):
@@ -430,7 +430,7 @@ class FakeResponse():
             if v is not None:
                 self.assertEqual(v, result[k])
             else:
-                self.assertFalse(k in result)
+                self.assertNotIn(k, result)
 
 
 class GetSocketTestCase(test_utils.BaseTestCase):
@@ -466,19 +466,19 @@ def test_correct_get_socket(self):
             'glance.common.wsgi.eventlet.listen',
             lambda *x, **y: None))
         wsgi.get_socket(1234)
-        self.assertTrue(mock.call().setsockopt(
+        self.assertIn(mock.call().setsockopt(
             socket.SOL_SOCKET,
             socket.SO_REUSEADDR,
-            1) in mock_socket.mock_calls)
-        self.assertTrue(mock.call().setsockopt(
+            1), mock_socket.mock_calls)
+        self.assertIn(mock.call().setsockopt(
             socket.SOL_SOCKET,
             socket.SO_KEEPALIVE,
-            1) in mock_socket.mock_calls)
+            1), mock_socket.mock_calls)
         if hasattr(socket, 'TCP_KEEPIDLE'):
-            self.assertTrue(mock.call().setsockopt(
+            self.assertIn(mock.call().setsockopt(
                 socket.IPPROTO_TCP,
                 socket.TCP_KEEPIDLE,
-                wsgi.CONF.tcp_keepidle) in mock_socket.mock_calls)
+                wsgi.CONF.tcp_keepidle), mock_socket.mock_calls)
 
     def test_get_socket_without_all_ssl_reqs(self):
         wsgi.CONF.key_file = None

glance/tests/unit/test_auth.py

@@ -305,14 +305,14 @@ def fake_do_request(cls, url, method, headers=None, body=None):
 
         for creds in good_creds:
             plugin = auth.KeystoneStrategy(creds)
-            self.assertTrue(plugin.authenticate() is None)
+            self.assertIsNone(plugin.authenticate())
             self.assertEqual(plugin.management_url, "example.com")
 
         # Assert it does not update management_url via auth response
         for creds in good_creds:
             plugin = auth.KeystoneStrategy(creds, configure_via_auth=False)
-            self.assertTrue(plugin.authenticate() is None)
-            self.assertTrue(plugin.management_url is None)
+            self.assertIsNone(plugin.authenticate())
+            self.assertIsNone(plugin.management_url)
 
     def test_v2_auth(self):
         """Test v2 auth code paths"""
@@ -387,7 +387,7 @@ def fake_do_request(cls, url, method, headers=None, body=None):
         }
 
         plugin = auth.KeystoneStrategy(no_region_creds)
-        self.assertTrue(plugin.authenticate() is None)
+        self.assertIsNone(plugin.authenticate())
         self.assertEqual(plugin.management_url, 'http://localhost:9292')
 
         # Add another image service, with a different region
@@ -483,7 +483,7 @@ def fake_do_request(cls, url, method, headers=None, body=None):
 
         for creds in good_creds:
             plugin = auth.KeystoneStrategy(creds)
-            self.assertTrue(plugin.authenticate() is None)
+            self.assertIsNone(plugin.authenticate())
             self.assertEqual(plugin.management_url, 'http://localhost:9292')
 
         ambiguous_region_creds = {

glance/tests/unit/test_cache_middleware.py

@@ -29,12 +29,12 @@ class TestCacheMiddlewareURLMatching(testtools.TestCase):
     def test_v1_no_match_detail(self):
         req = webob.Request.blank('/v1/images/detail')
         out = glance.api.middleware.cache.CacheFilter._match_request(req)
-        self.assertTrue(out is None)
+        self.assertIsNone(out)
 
     def test_v1_no_match_detail_with_query_params(self):
         req = webob.Request.blank('/v1/images/detail?limit=10')
         out = glance.api.middleware.cache.CacheFilter._match_request(req)
-        self.assertTrue(out is None)
+        self.assertIsNone(out)
 
     def test_v1_match_id_with_query_param(self):
         req = webob.Request.blank('/v1/images/asdf?ping=pong')
@@ -49,12 +49,12 @@ def test_v2_match_id(self):
     def test_v2_no_match_bad_path(self):
         req = webob.Request.blank('/v2/images/asdf')
         out = glance.api.middleware.cache.CacheFilter._match_request(req)
-        self.assertTrue(out is None)
+        self.assertIsNone(out)
 
     def test_no_match_unknown_version(self):
         req = webob.Request.blank('/v3/images/asdf')
         out = glance.api.middleware.cache.CacheFilter._match_request(req)
-        self.assertTrue(out is None)
+        self.assertIsNone(out)
 
 
 class TestCacheMiddlewareRequestStashCacheInfo(testtools.TestCase):
@@ -191,7 +191,7 @@ def fake_process_v1_request(request, image_id, image_iterator):
         self.stubs.Set(cache_filter, '_process_v1_request',
                        fake_process_v1_request)
         cache_filter.process_request(request)
-        self.assertTrue(image_id in cache_filter.cache.deleted_images)
+        self.assertIn(image_id, cache_filter.cache.deleted_images)
 
     def test_v1_process_request_image_fetch(self):
 
@@ -263,7 +263,7 @@ def fake_get_image_size(image_id):
         self.stubs.Set(cache_filter.cache, 'get_image_size',
                        fake_get_image_size)
         cache_filter._verify_metadata(image_meta)
-        self.assertTrue(image_meta['size'] == image_size)
+        self.assertEqual(image_size, image_meta['size'])
 
     def test_v2_process_request_response_headers(self):
         def dummy_img_iterator():

glance/tests/unit/test_db.py

@@ -188,7 +188,7 @@ def test_get_not_found(self):
         fake_uuid = str(uuid.uuid4())
         exc = self.assertRaises(exception.NotFound, self.image_repo.get,
                                 fake_uuid)
-        self.assertTrue(fake_uuid in unicode(exc))
+        self.assertIn(fake_uuid, unicode(exc))
 
     def test_get_forbidden(self):
         self.assertRaises(exception.NotFound, self.image_repo.get, UUID4)
@@ -329,7 +329,7 @@ def test_save_image_not_found(self):
         image.image_id = fake_uuid
         exc = self.assertRaises(exception.NotFound, self.image_repo.save,
                                 image)
-        self.assertTrue(fake_uuid in unicode(exc))
+        self.assertIn(fake_uuid, unicode(exc))
 
     def test_remove_image(self):
         image = self.image_repo.get(UUID1)
@@ -344,7 +344,7 @@ def test_remove_image_not_found(self):
         image.image_id = fake_uuid
         exc = self.assertRaises(exception.NotFound, self.image_repo.remove,
                                 image)
-        self.assertTrue(fake_uuid in unicode(exc))
+        self.assertIn(fake_uuid, unicode(exc))
 
 
 class TestEncryptedLocations(test_utils.BaseTestCase):
@@ -473,7 +473,7 @@ def test_add_image_member(self):
         image = self.image_repo.get(UUID1)
         image_member = self.image_member_factory.new_image_member(image,
                                                                   TENANT4)
-        self.assertTrue(image_member.id is None)
+        self.assertIsNone(image_member.id)
         self.image_member_repo.add(image_member)
         retreived_image_member = self.image_member_repo.get(TENANT4)
         self.assertIsNotNone(retreived_image_member.id)
@@ -488,7 +488,7 @@ def test_add_duplicate_image_member(self):
         image = self.image_repo.get(UUID1)
         image_member = self.image_member_factory.new_image_member(image,
                                                                   TENANT4)
-        self.assertTrue(image_member.id is None)
+        self.assertIsNone(image_member.id)
         self.image_member_repo.add(image_member)
         retreived_image_member = self.image_member_repo.get(TENANT4)
         self.assertIsNotNone(retreived_image_member.id)
@@ -536,7 +536,7 @@ def test_remove_image_member_does_not_exist(self):
         exc = self.assertRaises(exception.NotFound,
                                 self.image_member_repo.remove,
                                 fake_member)
-        self.assertTrue(fake_uuid in unicode(exc))
+        self.assertIn(fake_uuid, unicode(exc))
 
 
 class TestTaskRepo(test_utils.BaseTestCase):

glance/tests/unit/test_domain.py

@@ -41,8 +41,8 @@ def setUp(self):
 
     def test_minimal_new_image(self):
         image = self.image_factory.new_image()
-        self.assertTrue(image.image_id is not None)
-        self.assertTrue(image.created_at is not None)
+        self.assertIsNotNone(image.image_id)
+        self.assertIsNotNone(image.created_at)
         self.assertEqual(image.created_at, image.updated_at)
         self.assertEqual(image.status, 'queued')
         self.assertEqual(image.visibility, 'private')
@@ -51,7 +51,7 @@ def test_minimal_new_image(self):
         self.assertIsNone(image.size)
         self.assertEqual(image.min_disk, 0)
         self.assertEqual(image.min_ram, 0)
-        self.assertEqual(image.protected, False)
+        self.assertFalse(image.protected)
         self.assertIsNone(image.disk_format)
         self.assertIsNone(image.container_format)
         self.assertEqual(image.extra_properties, {})
@@ -62,7 +62,7 @@ def test_new_image(self):
             image_id=UUID1, name='image-1', min_disk=256,
             owner=TENANT1)
         self.assertEqual(image.image_id, UUID1)
-        self.assertTrue(image.created_at is not None)
+        self.assertIsNotNone(image.created_at)
         self.assertEqual(image.created_at, image.updated_at)
         self.assertEqual(image.status, 'queued')
         self.assertEqual(image.visibility, 'private')
@@ -71,7 +71,7 @@ def test_new_image(self):
         self.assertIsNone(image.size)
         self.assertEqual(image.min_disk, 256)
         self.assertEqual(image.min_ram, 0)
-        self.assertEqual(image.protected, False)
+        self.assertFalse(image.protected)
         self.assertIsNone(image.disk_format)
         self.assertIsNone(image.container_format)
         self.assertEqual(image.extra_properties, {})
@@ -85,7 +85,7 @@ def test_new_image_with_extra_properties_and_tags(self):
             extra_properties=extra_properties, tags=tags)
 
         self.assertEqual(image.image_id, UUID1)
-        self.assertTrue(image.created_at is not None)
+        self.assertIsNotNone(image.created_at)
         self.assertEqual(image.created_at, image.updated_at)
         self.assertEqual(image.status, 'queued')
         self.assertEqual(image.visibility, 'private')
@@ -94,7 +94,7 @@ def test_new_image_with_extra_properties_and_tags(self):
         self.assertIsNone(image.size)
         self.assertEqual(image.min_disk, 0)
         self.assertEqual(image.min_ram, 0)
-        self.assertEqual(image.protected, False)
+        self.assertFalse(image.protected)
         self.assertIsNone(image.disk_format)
         self.assertIsNone(image.container_format)
         self.assertEqual(image.extra_properties, {'foo': 'bar'})
@@ -221,10 +221,10 @@ def test_minimal_new_image_member(self):
         image_member = self.image_member_factory.new_image_member(image,
                                                                   member_id)
         self.assertEqual(image_member.image_id, image.image_id)
-        self.assertTrue(image_member.created_at is not None)
+        self.assertIsNotNone(image_member.created_at)
         self.assertEqual(image_member.created_at, image_member.updated_at)
         self.assertEqual(image_member.status, 'pending')
-        self.assertTrue(image_member.member_id is not None)
+        self.assertIsNotNone(image_member.member_id)
 
 
 class TestExtraProperties(test_utils.BaseTestCase):

glance/tests/unit/test_domain_proxy.py

@@ -131,7 +131,7 @@ def _test_method_with_proxied_argument(self, name, result):
         self.assertEqual(self.fake_repo.kwargs, {})
 
         if result is None:
-            self.assertTrue(proxy_result is None)
+            self.assertIsNone(proxy_result)
         else:
             self.assertIsInstance(proxy_result, FakeProxy)
             self.assertEqual(proxy_result.base, result)