openstack
/
monasca-tempest-plugin
Code Issues Proposed changes

Replace assertTrue(isinstance()) with assertIsInstance() 

Some of tests use different method of assertTrue(isinstance(A, B)) or
assertEqual(type(A), B). The correct way is to use assertIsInstance(A,
B) provided by testtools.
Closes-Bug: #1268480

Change-Id: Iaf9e1a36581b14fded7885ad27e8e9c9409397fd
This commit is contained in:
LiuNanke 2016-01-10 03:50:49 +08:00
parent 155837d1a1
commit caf4e64434
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
monasca_tempest_tests/tests/api/test_alarm_definitions.py
View File

@ -583,7 +583,7 @@ class TestAlarmDefinitions(base.BaseMonascaTest):
def _verify_list_alarm_definitions_response_body(self, resp,
response_body):
self.assertEqual(200, resp.status)
self.assertTrue(isinstance(response_body, dict))
self.assertIsInstance(response_body, dict)
self.assertTrue(set(['links', 'elements']) == set(response_body))
def _verify_list_get_alarm_definitions_elements(self, elements, num,
@ -627,7 +627,7 @@ class TestAlarmDefinitions(base.BaseMonascaTest):
set(element))
def _verify_list_alarm_definitions_links(self, links):
self.assertTrue(isinstance(links, list))
self.assertIsInstance(links, list)
link = links[0]
self.assertTrue(set(['rel', 'href']) == set(link))
self.assertEqual(link['rel'], u'self')

6
monasca_tempest_tests/tests/api/test_versions.py
View File

@ -32,7 +32,7 @@ class TestVersions(base.BaseMonascaTest):
self.assertEqual(resp.status, 200)
response_body = json.loads(response_body)
self.assertTrue(isinstance(response_body, dict))
self.assertIsInstance(response_body, dict)
version = response_body
self.assertTrue(set(['id', 'links', 'status', 'updated']) ==
set(version))
@ -40,9 +40,9 @@ class TestVersions(base.BaseMonascaTest):
self.assertEqual(version['status'], u'CURRENT')
date_object = datetime.datetime.strptime(version['updated'],
"%Y-%m-%dT%H:%M:%S.%fZ")
self.assertTrue(isinstance(date_object, datetime.datetime))
self.assertIsInstance(date_object, datetime.datetime)
links = response_body['links']
self.assertTrue(isinstance(links, list))
self.assertIsInstance(links, list)
link = links[0]
self.assertTrue(set(['rel', 'href']) ==
set(link))