Skip to content

Commit 84dbe32

Browse files
niksvniksv
committed
Replace assert* with more suitable asserts in unit tests
The following replacements were done in unit tests to have clearer messages in case of failure: - assertTrue(* is None) with assertIsNone - assertTrue(* is not None) with assertIsNotNone - assertTrue(* in *) with assertIn - assertTrue(* not in *) with assertNotIn - assertFalse(* in *) with assertNotIn - assertTrue(* == *) with assertEqual - assertTrue(* != *) with assertNotEqual Change-Id: I0c47f991c3974e441335e71c9d26fab8a127f2ca
1 parent 1d9b9d1 commit 84dbe32

25 files changed

+252
-254
lines changed

‎glance/tests/unit/api/test_cmd_cache_manage.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ def test_queue_image_not_forced_confirmed(self, mock_client, mock_confirm):
114114
self.assertEqual(cache_manage.queue_image(mock_options, ['img_id']),
115115
cache_manage.SUCCESS)
116116
self.assertTrue(mock_client.called)
117-
self.assertTrue(
118-
mock.call.mock_client().queue_image_for_caching('img_id') in
117+
self.assertIn(
118+
mock.call.mock_client().queue_image_for_caching('img_id'),
119119
manager.mock_calls)
120120

121121
def test_delete_cached_image_without_index(self):
@@ -154,8 +154,8 @@ def test_delete_cached_image_not_forced_confirmed(self, mock_client,
154154
cache_manage.delete_cached_image(mock_options, ['img_id']),
155155
cache_manage.SUCCESS)
156156

157-
self.assertTrue(
158-
mock.call.mock_client().delete_cached_image('img_id') in
157+
self.assertIn(
158+
mock.call.mock_client().delete_cached_image('img_id'),
159159
manager.mock_calls)
160160

161161
@mock.patch.object(glance.cmd.cache_manage, 'user_confirm')
@@ -190,8 +190,8 @@ def test_delete_cached_images_not_forced_confirmed(self, mock_client,
190190
cache_manage.delete_all_cached_images(mock_options, None),
191191
cache_manage.SUCCESS)
192192
self.assertTrue(mock_client.called)
193-
self.assertTrue(
194-
mock.call.mock_client().delete_all_cached_images() in
193+
self.assertIn(
194+
mock.call.mock_client().delete_all_cached_images(),
195195
manager.mock_calls)
196196

197197
def test_delete_queued_image_without_index(self):
@@ -230,8 +230,8 @@ def test_delete_queued_image_not_forced_confirmed(self, mock_client,
230230
cache_manage.delete_queued_image(mock_options, ['img_id']),
231231
cache_manage.SUCCESS)
232232
self.assertTrue(mock_client.called)
233-
self.assertTrue(
234-
mock.call.mock_client().delete_queued_image('img_id') in
233+
self.assertIn(
234+
mock.call.mock_client().delete_queued_image('img_id'),
235235
manager.mock_calls)
236236

237237
@mock.patch.object(glance.cmd.cache_manage, 'user_confirm')
@@ -265,8 +265,8 @@ def test_delete_queued_images_not_forced_confirmed(self, mock_client,
265265
cache_manage.delete_all_queued_images(mock_options, None),
266266
cache_manage.SUCCESS)
267267
self.assertTrue(mock_client.called)
268-
self.assertTrue(
269-
mock.call.mock_client().delete_all_queued_images() in
268+
self.assertIn(
269+
mock.call.mock_client().delete_all_queued_images(),
270270
manager.mock_calls)
271271

272272
@mock.patch.object(glance.cmd.cache_manage, 'get_client')

‎glance/tests/unit/api/test_property_protections.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def test_get_image(self):
7676
self.assertEqual(result_extra_props['spl_read_prop'], 'r')
7777
self.assertEqual(result_extra_props['spl_update_prop'], 'u')
7878
self.assertEqual(result_extra_props['spl_delete_prop'], 'd')
79-
self.assertFalse('forbidden' in result_extra_props.keys())
79+
self.assertNotIn('forbidden', result_extra_props.keys())
8080

8181
def test_list_image(self):
8282
result_images = self.image_repo.list()
@@ -86,14 +86,14 @@ def test_list_image(self):
8686
self.assertEqual(result_extra_props['spl_read_prop'], 'r')
8787
self.assertEqual(result_extra_props['spl_update_prop'], 'u')
8888
self.assertEqual(result_extra_props['spl_delete_prop'], 'd')
89-
self.assertFalse('forbidden' in result_extra_props.keys())
89+
self.assertNotIn('forbidden', result_extra_props.keys())
9090

9191
result_extra_props = result_images[1].extra_properties
9292
self.assertEqual(result_extra_props, {})
9393

9494
result_extra_props = result_images[2].extra_properties
9595
self.assertEqual(result_extra_props['spl_read_prop'], 'r')
96-
self.assertFalse('forbidden' in result_extra_props.keys())
96+
self.assertNotIn('forbidden', result_extra_props.keys())
9797

9898

9999
class TestProtectedImageProxy(utils.BaseTestCase):
@@ -116,7 +116,7 @@ def test_read_image_with_extra_prop(self):
116116
image, context, self.property_rules)
117117
result_extra_props = result_image.extra_properties
118118
self.assertEqual(result_extra_props['spl_read_prop'], 'read')
119-
self.assertFalse('spl_fake_prop' in result_extra_props.keys())
119+
self.assertNotIn('spl_fake_prop', result_extra_props.keys())
120120

121121

122122
class TestExtraPropertiesProxy(utils.BaseTestCase):

‎glance/tests/unit/common/test_exception.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class FakeGlanceException(exception.GlanceException):
2929
self.assertEqual(unicode(exc), 'default message')
3030

3131
def test_specified_error_msg(self):
32-
self.assertTrue('test' in unicode(exception.GlanceException('test')))
32+
self.assertIn('test', unicode(exception.GlanceException('test')))
3333

3434
def test_default_error_msg_with_kwargs(self):
3535
class FakeGlanceException(exception.GlanceException):
@@ -39,9 +39,9 @@ class FakeGlanceException(exception.GlanceException):
3939
self.assertEqual(unicode(exc), "default message: 500")
4040

4141
def test_specified_error_msg_with_kwargs(self):
42-
self.assertTrue('test: 500' in
43-
unicode(exception.GlanceException('test: %(code)s',
44-
code=500)))
42+
self.assertIn('test: 500',
43+
unicode(exception.GlanceException('test: %(code)s',
44+
code=500)))
4545

4646
def test_non_unicode_error_msg(self):
4747
exc = exception.GlanceException(str('test'))

‎glance/tests/unit/common/test_rpc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ def test_has_body_has_content_length(self):
307307
request = wsgi.Request.blank('/')
308308
request.method = 'POST'
309309
request.body = 'asdf'
310-
self.assertTrue('Content-Length' in request.headers)
310+
self.assertIn('Content-Length', request.headers)
311311
self.assertTrue(rpc.RPCJSONDeserializer().has_body(request))
312312

313313
def test_no_body_no_content_length(self):
@@ -344,7 +344,7 @@ def test_has_body_has_transfer_encoding(self):
344344
request.method = 'POST'
345345
request.body = 'fake_body'
346346
request.headers['transfer-encoding'] = 0
347-
self.assertTrue('transfer-encoding' in request.headers)
347+
self.assertIn('transfer-encoding', request.headers)
348348
self.assertTrue(rpc.RPCJSONDeserializer().has_body(request))
349349

350350
def test_to_json_with_date_format_value(self):

‎glance/tests/unit/common/test_wsgi.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ def test_has_body_has_content_length(self):
334334
request = wsgi.Request.blank('/')
335335
request.method = 'POST'
336336
request.body = 'asdf'
337-
self.assertTrue('Content-Length' in request.headers)
337+
self.assertIn('Content-Length', request.headers)
338338
self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
339339

340340
def test_no_body_no_content_length(self):
@@ -371,7 +371,7 @@ def test_has_body_has_transfer_encoding(self):
371371
request.method = 'POST'
372372
request.body = 'fake_body'
373373
request.headers['transfer-encoding'] = 0
374-
self.assertTrue('transfer-encoding' in request.headers)
374+
self.assertIn('transfer-encoding', request.headers)
375375
self.assertTrue(wsgi.JSONRequestDeserializer().has_body(request))
376376

377377
def test_get_bind_addr_default_value(self):
@@ -430,7 +430,7 @@ class FakeResponse():
430430
if v is not None:
431431
self.assertEqual(v, result[k])
432432
else:
433-
self.assertFalse(k in result)
433+
self.assertNotIn(k, result)
434434

435435

436436
class GetSocketTestCase(test_utils.BaseTestCase):
@@ -466,19 +466,19 @@ def test_correct_get_socket(self):
466466
'glance.common.wsgi.eventlet.listen',
467467
lambda *x, **y: None))
468468
wsgi.get_socket(1234)
469-
self.assertTrue(mock.call().setsockopt(
469+
self.assertIn(mock.call().setsockopt(
470470
socket.SOL_SOCKET,
471471
socket.SO_REUSEADDR,
472-
1) in mock_socket.mock_calls)
473-
self.assertTrue(mock.call().setsockopt(
472+
1), mock_socket.mock_calls)
473+
self.assertIn(mock.call().setsockopt(
474474
socket.SOL_SOCKET,
475475
socket.SO_KEEPALIVE,
476-
1) in mock_socket.mock_calls)
476+
1), mock_socket.mock_calls)
477477
if hasattr(socket, 'TCP_KEEPIDLE'):
478-
self.assertTrue(mock.call().setsockopt(
478+
self.assertIn(mock.call().setsockopt(
479479
socket.IPPROTO_TCP,
480480
socket.TCP_KEEPIDLE,
481-
wsgi.CONF.tcp_keepidle) in mock_socket.mock_calls)
481+
wsgi.CONF.tcp_keepidle), mock_socket.mock_calls)
482482

483483
def test_get_socket_without_all_ssl_reqs(self):
484484
wsgi.CONF.key_file = None

‎glance/tests/unit/test_auth.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,14 +305,14 @@ def fake_do_request(cls, url, method, headers=None, body=None):
305305

306306
for creds in good_creds:
307307
plugin = auth.KeystoneStrategy(creds)
308-
self.assertTrue(plugin.authenticate() is None)
308+
self.assertIsNone(plugin.authenticate())
309309
self.assertEqual(plugin.management_url, "example.com")
310310

311311
# Assert it does not update management_url via auth response
312312
for creds in good_creds:
313313
plugin = auth.KeystoneStrategy(creds, configure_via_auth=False)
314-
self.assertTrue(plugin.authenticate() is None)
315-
self.assertTrue(plugin.management_url is None)
314+
self.assertIsNone(plugin.authenticate())
315+
self.assertIsNone(plugin.management_url)
316316

317317
def test_v2_auth(self):
318318
"""Test v2 auth code paths"""
@@ -387,7 +387,7 @@ def fake_do_request(cls, url, method, headers=None, body=None):
387387
}
388388

389389
plugin = auth.KeystoneStrategy(no_region_creds)
390-
self.assertTrue(plugin.authenticate() is None)
390+
self.assertIsNone(plugin.authenticate())
391391
self.assertEqual(plugin.management_url, 'http://localhost:9292')
392392

393393
# Add another image service, with a different region
@@ -483,7 +483,7 @@ def fake_do_request(cls, url, method, headers=None, body=None):
483483

484484
for creds in good_creds:
485485
plugin = auth.KeystoneStrategy(creds)
486-
self.assertTrue(plugin.authenticate() is None)
486+
self.assertIsNone(plugin.authenticate())
487487
self.assertEqual(plugin.management_url, 'http://localhost:9292')
488488

489489
ambiguous_region_creds = {

‎glance/tests/unit/test_cache_middleware.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ class TestCacheMiddlewareURLMatching(testtools.TestCase):
2929
def test_v1_no_match_detail(self):
3030
req = webob.Request.blank('/v1/images/detail')
3131
out = glance.api.middleware.cache.CacheFilter._match_request(req)
32-
self.assertTrue(out is None)
32+
self.assertIsNone(out)
3333

3434
def test_v1_no_match_detail_with_query_params(self):
3535
req = webob.Request.blank('/v1/images/detail?limit=10')
3636
out = glance.api.middleware.cache.CacheFilter._match_request(req)
37-
self.assertTrue(out is None)
37+
self.assertIsNone(out)
3838

3939
def test_v1_match_id_with_query_param(self):
4040
req = webob.Request.blank('/v1/images/asdf?ping=pong')
@@ -49,12 +49,12 @@ def test_v2_match_id(self):
4949
def test_v2_no_match_bad_path(self):
5050
req = webob.Request.blank('/v2/images/asdf')
5151
out = glance.api.middleware.cache.CacheFilter._match_request(req)
52-
self.assertTrue(out is None)
52+
self.assertIsNone(out)
5353

5454
def test_no_match_unknown_version(self):
5555
req = webob.Request.blank('/v3/images/asdf')
5656
out = glance.api.middleware.cache.CacheFilter._match_request(req)
57-
self.assertTrue(out is None)
57+
self.assertIsNone(out)
5858

5959

6060
class TestCacheMiddlewareRequestStashCacheInfo(testtools.TestCase):
@@ -191,7 +191,7 @@ def fake_process_v1_request(request, image_id, image_iterator):
191191
self.stubs.Set(cache_filter, '_process_v1_request',
192192
fake_process_v1_request)
193193
cache_filter.process_request(request)
194-
self.assertTrue(image_id in cache_filter.cache.deleted_images)
194+
self.assertIn(image_id, cache_filter.cache.deleted_images)
195195

196196
def test_v1_process_request_image_fetch(self):
197197

@@ -263,7 +263,7 @@ def fake_get_image_size(image_id):
263263
self.stubs.Set(cache_filter.cache, 'get_image_size',
264264
fake_get_image_size)
265265
cache_filter._verify_metadata(image_meta)
266-
self.assertTrue(image_meta['size'] == image_size)
266+
self.assertEqual(image_size, image_meta['size'])
267267

268268
def test_v2_process_request_response_headers(self):
269269
def dummy_img_iterator():

‎glance/tests/unit/test_db.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def test_get_not_found(self):
188188
fake_uuid = str(uuid.uuid4())
189189
exc = self.assertRaises(exception.NotFound, self.image_repo.get,
190190
fake_uuid)
191-
self.assertTrue(fake_uuid in unicode(exc))
191+
self.assertIn(fake_uuid, unicode(exc))
192192

193193
def test_get_forbidden(self):
194194
self.assertRaises(exception.NotFound, self.image_repo.get, UUID4)
@@ -329,7 +329,7 @@ def test_save_image_not_found(self):
329329
image.image_id = fake_uuid
330330
exc = self.assertRaises(exception.NotFound, self.image_repo.save,
331331
image)
332-
self.assertTrue(fake_uuid in unicode(exc))
332+
self.assertIn(fake_uuid, unicode(exc))
333333

334334
def test_remove_image(self):
335335
image = self.image_repo.get(UUID1)
@@ -344,7 +344,7 @@ def test_remove_image_not_found(self):
344344
image.image_id = fake_uuid
345345
exc = self.assertRaises(exception.NotFound, self.image_repo.remove,
346346
image)
347-
self.assertTrue(fake_uuid in unicode(exc))
347+
self.assertIn(fake_uuid, unicode(exc))
348348

349349

350350
class TestEncryptedLocations(test_utils.BaseTestCase):
@@ -473,7 +473,7 @@ def test_add_image_member(self):
473473
image = self.image_repo.get(UUID1)
474474
image_member = self.image_member_factory.new_image_member(image,
475475
TENANT4)
476-
self.assertTrue(image_member.id is None)
476+
self.assertIsNone(image_member.id)
477477
self.image_member_repo.add(image_member)
478478
retreived_image_member = self.image_member_repo.get(TENANT4)
479479
self.assertIsNotNone(retreived_image_member.id)
@@ -488,7 +488,7 @@ def test_add_duplicate_image_member(self):
488488
image = self.image_repo.get(UUID1)
489489
image_member = self.image_member_factory.new_image_member(image,
490490
TENANT4)
491-
self.assertTrue(image_member.id is None)
491+
self.assertIsNone(image_member.id)
492492
self.image_member_repo.add(image_member)
493493
retreived_image_member = self.image_member_repo.get(TENANT4)
494494
self.assertIsNotNone(retreived_image_member.id)
@@ -536,7 +536,7 @@ def test_remove_image_member_does_not_exist(self):
536536
exc = self.assertRaises(exception.NotFound,
537537
self.image_member_repo.remove,
538538
fake_member)
539-
self.assertTrue(fake_uuid in unicode(exc))
539+
self.assertIn(fake_uuid, unicode(exc))
540540

541541

542542
class TestTaskRepo(test_utils.BaseTestCase):

‎glance/tests/unit/test_domain.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def setUp(self):
4141

4242
def test_minimal_new_image(self):
4343
image = self.image_factory.new_image()
44-
self.assertTrue(image.image_id is not None)
45-
self.assertTrue(image.created_at is not None)
44+
self.assertIsNotNone(image.image_id)
45+
self.assertIsNotNone(image.created_at)
4646
self.assertEqual(image.created_at, image.updated_at)
4747
self.assertEqual(image.status, 'queued')
4848
self.assertEqual(image.visibility, 'private')
@@ -51,7 +51,7 @@ def test_minimal_new_image(self):
5151
self.assertIsNone(image.size)
5252
self.assertEqual(image.min_disk, 0)
5353
self.assertEqual(image.min_ram, 0)
54-
self.assertEqual(image.protected, False)
54+
self.assertFalse(image.protected)
5555
self.assertIsNone(image.disk_format)
5656
self.assertIsNone(image.container_format)
5757
self.assertEqual(image.extra_properties, {})
@@ -62,7 +62,7 @@ def test_new_image(self):
6262
image_id=UUID1, name='image-1', min_disk=256,
6363
owner=TENANT1)
6464
self.assertEqual(image.image_id, UUID1)
65-
self.assertTrue(image.created_at is not None)
65+
self.assertIsNotNone(image.created_at)
6666
self.assertEqual(image.created_at, image.updated_at)
6767
self.assertEqual(image.status, 'queued')
6868
self.assertEqual(image.visibility, 'private')
@@ -71,7 +71,7 @@ def test_new_image(self):
7171
self.assertIsNone(image.size)
7272
self.assertEqual(image.min_disk, 256)
7373
self.assertEqual(image.min_ram, 0)
74-
self.assertEqual(image.protected, False)
74+
self.assertFalse(image.protected)
7575
self.assertIsNone(image.disk_format)
7676
self.assertIsNone(image.container_format)
7777
self.assertEqual(image.extra_properties, {})
@@ -85,7 +85,7 @@ def test_new_image_with_extra_properties_and_tags(self):
8585
extra_properties=extra_properties, tags=tags)
8686

8787
self.assertEqual(image.image_id, UUID1)
88-
self.assertTrue(image.created_at is not None)
88+
self.assertIsNotNone(image.created_at)
8989
self.assertEqual(image.created_at, image.updated_at)
9090
self.assertEqual(image.status, 'queued')
9191
self.assertEqual(image.visibility, 'private')
@@ -94,7 +94,7 @@ def test_new_image_with_extra_properties_and_tags(self):
9494
self.assertIsNone(image.size)
9595
self.assertEqual(image.min_disk, 0)
9696
self.assertEqual(image.min_ram, 0)
97-
self.assertEqual(image.protected, False)
97+
self.assertFalse(image.protected)
9898
self.assertIsNone(image.disk_format)
9999
self.assertIsNone(image.container_format)
100100
self.assertEqual(image.extra_properties, {'foo': 'bar'})
@@ -221,10 +221,10 @@ def test_minimal_new_image_member(self):
221221
image_member = self.image_member_factory.new_image_member(image,
222222
member_id)
223223
self.assertEqual(image_member.image_id, image.image_id)
224-
self.assertTrue(image_member.created_at is not None)
224+
self.assertIsNotNone(image_member.created_at)
225225
self.assertEqual(image_member.created_at, image_member.updated_at)
226226
self.assertEqual(image_member.status, 'pending')
227-
self.assertTrue(image_member.member_id is not None)
227+
self.assertIsNotNone(image_member.member_id)
228228

229229

230230
class TestExtraProperties(test_utils.BaseTestCase):

‎glance/tests/unit/test_domain_proxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def _test_method_with_proxied_argument(self, name, result):
131131
self.assertEqual(self.fake_repo.kwargs, {})
132132

133133
if result is None:
134-
self.assertTrue(proxy_result is None)
134+
self.assertIsNone(proxy_result)
135135
else:
136136
self.assertIsInstance(proxy_result, FakeProxy)
137137
self.assertEqual(proxy_result.base, result)

0 commit comments

Comments
 (0)