openstack
/
python-novaclient
Code Issues Proposed changes

Replace assertTrue(isinstance()) by optimal assert 

assertTrue(isinstance(A, B)) or assertEqual(type(A), B) in tests
should be replaced by assertIsInstance(A, B) provided by testtools.

Change-Id: Ie4fe7b40e3f4350db94b350395269340ee6acf11
Related-bug: #1268480
This commit is contained in:
LiuNanke 2016-01-07 02:55:45 +08:00
parent 7d05f540ea
commit 6d023a6bc2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/tests/unit/v2/test_security_group_rules.py
View File

@ -43,7 +43,7 @@ class SecurityGroupRulesTest(utils.FixturedTestCase):
}
self.assert_called('POST', '/os-security-group-rules', body)
self.assertTrue(isinstance(sg, security_group_rules.SecurityGroupRule))
self.assertIsInstance(sg, security_group_rules.SecurityGroupRule)
def test_create_security_group_group_rule(self):
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
@ -61,7 +61,7 @@ class SecurityGroupRulesTest(utils.FixturedTestCase):
}
self.assert_called('POST', '/os-security-group-rules', body)
self.assertTrue(isinstance(sg, security_group_rules.SecurityGroupRule))
self.assertIsInstance(sg, security_group_rules.SecurityGroupRule)
def test_invalid_parameters_create(self):
self.assertRaises(exceptions.CommandError,

16
novaclient/tests/unit/v2/test_server_groups.py
View File

@ -28,15 +28,15 @@ class ServerGroupsTest(utils.FixturedTestCase):
result = self.cs.server_groups.list()
self.assert_called('GET', '/os-server-groups')
for server_group in result:
self.assertTrue(isinstance(server_group,
server_groups.ServerGroup))
self.assertIsInstance(server_group,
server_groups.ServerGroup)
def test_list_server_groups_with_all_projects(self):
result = self.cs.server_groups.list(all_projects=True)
self.assert_called('GET', '/os-server-groups?all_projects')
for server_group in result:
self.assertTrue(isinstance(server_group,
server_groups.ServerGroup))
self.assertIsInstance(server_group,
server_groups.ServerGroup)
def test_create_server_group(self):
kwargs = {'name': 'ig1',
@ -44,15 +44,15 @@ class ServerGroupsTest(utils.FixturedTestCase):
server_group = self.cs.server_groups.create(**kwargs)
body = {'server_group': kwargs}
self.assert_called('POST', '/os-server-groups', body)
self.assertTrue(isinstance(server_group,
server_groups.ServerGroup))
self.assertIsInstance(server_group,
server_groups.ServerGroup)
def test_get_server_group(self):
id = '2cbd51f4-fafe-4cdb-801b-cf913a6f288b'
server_group = self.cs.server_groups.get(id)
self.assert_called('GET', '/os-server-groups/%s' % id)
self.assertTrue(isinstance(server_group,
server_groups.ServerGroup))
self.assertIsInstance(server_group,
server_groups.ServerGroup)
def test_delete_server_group(self):
id = '2cbd51f4-fafe-4cdb-801b-cf913a6f288b'