openstack/monasca-api
Code Issues Proposed changes

Replace assertTrue(isinstance()) with assertIsInstance()

Browse Source 
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 ff6c6fa393
commit c082be5e8f
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
monasca_api/tests/test_versions.py
View File

@@ -31,11 +31,11 @@ class TestVersions(testing.TestBase):
result = self.simulate_request('/versions') result = self.simulate_request('/versions')
self.assertEqual(self.srmock.status, falcon.HTTP_200) self.assertEqual(self.srmock.status, falcon.HTTP_200)
response = json.loads(result[0]) response = json.loads(result[0])
self.assertTrue(isinstance(response, dict)) self.assertIsInstance(response, dict)
self.assertTrue(set(['links', 'elements']) == self.assertTrue(set(['links', 'elements']) ==
set(response)) set(response))
links = response['links'] links = response['links']
self.assertTrue(isinstance(links, list)) self.assertIsInstance(links, list)
link = links[0] link = links[0]
self.assertTrue(set(['rel', 'href']) == self.assertTrue(set(['rel', 'href']) ==
set(link)) set(link))
@@ -46,7 +46,7 @@ class TestVersions(testing.TestBase):
result = self.simulate_request('/versions/v2.0') result = self.simulate_request('/versions/v2.0')
self.assertEqual(self.srmock.status, falcon.HTTP_200) self.assertEqual(self.srmock.status, falcon.HTTP_200)
response = json.loads(result[0]) response = json.loads(result[0])
self.assertTrue(isinstance(response, dict)) self.assertIsInstance(response, dict)
version = response version = response
self.assertTrue(set(['id', 'links', 'status', 'updated']) == self.assertTrue(set(['id', 'links', 'status', 'updated']) ==
set(version)) set(version))
@@ -54,9 +54,9 @@ class TestVersions(testing.TestBase):
self.assertEqual(version['status'], u'CURRENT') self.assertEqual(version['status'], u'CURRENT')
date_object = datetime.datetime.strptime(version['updated'], date_object = datetime.datetime.strptime(version['updated'],
"%Y-%m-%dT%H:%M:%S.%fZ") "%Y-%m-%dT%H:%M:%S.%fZ")
self.assertTrue(isinstance(date_object, datetime.datetime)) self.assertIsInstance(date_object, datetime.datetime)
links = response['links'] links = response['links']
self.assertTrue(isinstance(links, list)) self.assertIsInstance(links, list)
link = links[0] link = links[0]
self.assertTrue(set(['rel', 'href']) == self.assertTrue(set(['rel', 'href']) ==
set(link)) set(link))

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, def _verify_list_alarm_definitions_response_body(self, resp,
response_body): response_body):
self.assertEqual(200, resp.status) self.assertEqual(200, resp.status)
self.assertTrue(isinstance(response_body, dict)) self.assertIsInstance(response_body, dict)
self.assertTrue(set(['links', 'elements']) == set(response_body)) self.assertTrue(set(['links', 'elements']) == set(response_body))
def _verify_list_get_alarm_definitions_elements(self, elements, num, def _verify_list_get_alarm_definitions_elements(self, elements, num,
@@ -627,7 +627,7 @@ class TestAlarmDefinitions(base.BaseMonascaTest):
set(element)) set(element))
def _verify_list_alarm_definitions_links(self, links): def _verify_list_alarm_definitions_links(self, links):
self.assertTrue(isinstance(links, list)) self.assertIsInstance(links, list)
link = links[0] link = links[0]
self.assertTrue(set(['rel', 'href']) == set(link)) self.assertTrue(set(['rel', 'href']) == set(link))
self.assertEqual(link['rel'], u'self') 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) self.assertEqual(resp.status, 200)
response_body = json.loads(response_body) response_body = json.loads(response_body)
self.assertTrue(isinstance(response_body, dict)) self.assertIsInstance(response_body, dict)
version = response_body version = response_body
self.assertTrue(set(['id', 'links', 'status', 'updated']) == self.assertTrue(set(['id', 'links', 'status', 'updated']) ==
set(version)) set(version))
@@ -40,9 +40,9 @@ class TestVersions(base.BaseMonascaTest):
self.assertEqual(version['status'], u'CURRENT') self.assertEqual(version['status'], u'CURRENT')
date_object = datetime.datetime.strptime(version['updated'], date_object = datetime.datetime.strptime(version['updated'],
"%Y-%m-%dT%H:%M:%S.%fZ") "%Y-%m-%dT%H:%M:%S.%fZ")
self.assertTrue(isinstance(date_object, datetime.datetime)) self.assertIsInstance(date_object, datetime.datetime)
links = response_body['links'] links = response_body['links']
self.assertTrue(isinstance(links, list)) self.assertIsInstance(links, list)
link = links[0] link = links[0]
self.assertTrue(set(['rel', 'href']) == self.assertTrue(set(['rel', 'href']) ==
set(link)) set(link))