openstack
/
glance
Code Issues Proposed changes

Use more specific asserts in unit tests 

In many places, there are more specific asserts
which can be used. I replaced the generic assert
with more specific ones, where it was possible.

This change enhances readibility, and on fail, more useful
message is displayed

Change-Id: I76dca80b6bd8886860fb383ee8d35e16cd99762e
This commit is contained in:
Gábor Antal 2016-08-04 12:33:42 +02:00
parent 70b930136a
commit 53379a714d
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance/tests/unit/api/test_cmd_cache_manage.py
View File

@ -353,7 +353,7 @@ class TestGlanceCmdManage(test_utils.BaseTestCase):
def test_create_option(self):
oparser = optparse.OptionParser()
cache_manage.create_options(oparser)
self.assertTrue(len(oparser.option_list) > 0)
self.assertGreater(len(oparser.option_list), 0)
@mock.patch.object(glance.cmd.cache_manage, 'lookup_command')
def test_parse_options_no_parameters(self, mock_lookup):

18
glance/tests/unit/common/test_timeutils.py
View File

@ -134,17 +134,17 @@ class TestIso8601Time(test_utils.BaseTestCase):
zulu = timeutils.parse_isotime('2012-02-14T20:53:07')
east = timeutils.parse_isotime('2012-02-14T20:53:07-01:00')
west = timeutils.parse_isotime('2012-02-14T20:53:07+01:00')
self.assertTrue(east > west)
self.assertTrue(east > zulu)
self.assertTrue(zulu > west)
self.assertGreater(east, west)
self.assertGreater(east, zulu)
self.assertGreater(zulu, west)
def test_compare_micros(self):
zulu = timeutils.parse_isotime('2012-02-14T20:53:07.6544')
east = timeutils.parse_isotime('2012-02-14T19:53:07.654321-01:00')
west = timeutils.parse_isotime('2012-02-14T21:53:07.655+01:00')
self.assertTrue(east < west)
self.assertTrue(east < zulu)
self.assertTrue(zulu < west)
self.assertLess(east, west)
self.assertLess(east, zulu)
self.assertLess(zulu, west)
def test_zulu_roundtrip(self):
time_str = '2012-02-14T20:53:07Z'
@ -193,17 +193,17 @@ class TestIso8601Time(test_utils.BaseTestCase):
time_str = '2011-02-14T20:53:07+21:00'
aware = timeutils.parse_isotime(time_str)
naive = timeutils.normalize_time(aware)
self.assertTrue(naive < dt)
self.assertLess(naive, dt)
def test_normalize_zulu_aware_to_naive(self):
dt = datetime.datetime(2011, 2, 14, 20, 53, 7)
time_str = '2011-02-14T19:53:07Z'
aware = timeutils.parse_isotime(time_str)
naive = timeutils.normalize_time(aware)
self.assertTrue(naive < dt)
self.assertLess(naive, dt)
def test_normalize_naive(self):
dt = datetime.datetime(2011, 2, 14, 20, 53, 7)
dtn = datetime.datetime(2011, 2, 14, 19, 53, 7)
naive = timeutils.normalize_time(dtn)
self.assertTrue(naive < dt)
self.assertLess(naive, dt)

2
glance/tests/unit/common/test_utils.py
View File

@ -362,7 +362,7 @@ class TestUtils(test_utils.BaseTestCase):
']' if escaped else '')
self.assertTrue(pair_str.startswith(expected_host))
self.assertTrue(port > 0)
self.assertGreater(port, 0)
expected_pair = '%s:%d' % (expected_host, port)
self.assertEqual(expected_pair, pair_str)

6
glance/tests/unit/test_db.py
View File

@ -361,7 +361,7 @@ class TestImageRepo(test_utils.BaseTestCase):
image.tags = ['king', 'kong']
self.image_repo.save(image)
current_update_time = image.updated_at
self.assertTrue(current_update_time > original_update_time)
self.assertGreater(current_update_time, original_update_time)
image = self.image_repo.get(UUID1)
self.assertEqual('foo', image.name)
self.assertEqual(set(['king', 'kong']), image.tags)
@ -379,7 +379,7 @@ class TestImageRepo(test_utils.BaseTestCase):
image = self.image_repo.get(UUID1)
previous_update_time = image.updated_at
self.image_repo.remove(image)
self.assertTrue(image.updated_at > previous_update_time)
self.assertGreater(image.updated_at, previous_update_time)
self.assertRaises(exception.ImageNotFound, self.image_repo.get, UUID1)
def test_remove_image_not_found(self):
@ -714,7 +714,7 @@ class TestTaskRepo(test_utils.BaseTestCase):
original_update_time = task.updated_at
self.task_repo.save(task)
current_update_time = task.updated_at
self.assertTrue(current_update_time > original_update_time)
self.assertGreater(current_update_time, original_update_time)
task = self.task_repo.get(UUID1)
self.assertEqual(current_update_time, task.updated_at)

2
glance/tests/unit/test_domain.py
View File

@ -591,4 +591,4 @@ class TestArtifactTypeFactory(test_utils.BaseTestCase):
artifact = self.factory.new_artifact("foo", "1.0.0-alpha")
self.assertEqual('creating', artifact.state)
self.assertEqual('me', artifact.owner)
self.assertTrue(artifact.id is not None)
self.assertIsNotNone(artifact.id)

2
glance/tests/unit/test_migrations.py
View File

@ -1842,7 +1842,7 @@ class TestMysqlMigrations(test_base.MySQLOpportunisticTestCase,
"FROM information_schema.TABLES "
"WHERE TABLE_SCHEMA='%s'"
% self.migrate_engine.url.database)
self.assertTrue(total.scalar() > 0, "No tables found. Wrong schema?")
self.assertGreater(total.scalar(), 0, "No tables found. Wrong schema?")
noninnodb = self.migrate_engine.execute(
"SELECT count(*) "