x
/
mogan
Code Issues Proposed changes

Using assertIsNone(xxx) instead of assertEqual(None, xxx) 

TrivilalFix

Following OpenStack Style Guidelines:
[1] http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises
[H203] Unit test assertions tend to give better messages for more
specific assertions. As a result, assertIsNone(xxx) is preferred over
assertEqual(None, xxx) and assertIs(xxx, None)

Change-Id: I8ea5708d2dd71ed29abdf21036f0d671eff2cd26
This commit is contained in:
jeremy.zhang 2017-05-28 00:18:03 +08:00
parent 17a45afa72
commit d27cd4c018
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mogan/tests/functional/api/v1/test_servers.py
View File

@ -150,7 +150,7 @@ class TestServers(v1_test.APITestV1):
self.assertEqual(self.INSTANCE_TYPE_UUID, resp['flavor_uuid'])
self.assertEqual('b8f82429-3a13-4ffe-9398-4d1abdc256a8',
resp['image_uuid'])
self.assertEqual(None, resp['availability_zone'])
self.assertIsNone(resp['availability_zone'])
self.assertEqual([], resp['nics'])
self.assertEqual({'fake_key': 'fake_value'}, resp['extra'])
self.assertIn('links', resp)
@ -172,7 +172,7 @@ class TestServers(v1_test.APITestV1):
self.assertEqual(self.INSTANCE_TYPE_UUID, resp['flavor_uuid'])
self.assertEqual('b8f82429-3a13-4ffe-9398-4d1abdc256a8',
resp['image_uuid'])
self.assertEqual(None, resp['availability_zone'])
self.assertIsNone(resp['availability_zone'])
self.assertEqual([], resp['nics'])
self.assertEqual({'fake_key': 'fake_value'}, resp['extra'])
self.assertIn('links', resp)

6
mogan/tests/unit/engine/test_engine_api.py
View File

@ -70,7 +70,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
self.assertEqual(flavor.uuid, base_opts['flavor_uuid'])
self.assertEqual({'k1', 'v1'}, base_opts['extra'])
self.assertEqual('test_az', base_opts['availability_zone'])
self.assertEqual(None, key_pair)
self.assertIsNone(key_pair)
@mock.patch.object(objects.Server, 'create')
def test__provision_servers(self, mock_server_create):
@ -224,7 +224,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
fake_server_obj = self._create_fake_server_obj(fake_server)
self.engine_api.unlock(self.context, fake_server_obj)
self.assertFalse(fake_server_obj.locked)
self.assertEqual(None, fake_server_obj.locked_by)
self.assertIsNone(fake_server_obj.locked_by)
def test_lock_by_admin(self):
fake_server = db_utils.get_test_server(
@ -243,7 +243,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
admin_context = context.get_admin_context()
self.engine_api.unlock(admin_context, fake_server_obj)
self.assertFalse(fake_server_obj.locked)
self.assertEqual(None, fake_server_obj.locked_by)
self.assertIsNone(fake_server_obj.locked_by)
@mock.patch('mogan.engine.api.API._delete_server')
def test_delete_locked_server_with_non_admin(self, mock_deleted):