openstack
/
ironic
Code Issues Proposed changes

Merge "Use assertTrue/False instead of assertEqual(T/F)"

This commit is contained in:
Jenkins 2016-01-07 08:44:29 +00:00 committed by Gerrit Code Review
parent b48289e8a2 a23b9b7fbd
commit 7265582506
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic/tests/unit/api/v1/test_nodes.py
View File

@ -1682,7 +1682,7 @@ class TestDelete(test_api_base.BaseApiTest):
response = self.delete('/nodes/%s/maintenance' % node.uuid)
self.assertEqual(http_client.ACCEPTED, response.status_int)
self.assertEqual(b'', response.body)
self.assertEqual(False, node.maintenance)
self.assertFalse(node.maintenance)
self.assertIsNone(node.maintenance_reason)
mock_get.assert_called_once_with(mock.ANY, node.uuid)
mock_update.assert_called_once_with(mock.ANY, mock.ANY,
@ -1700,7 +1700,7 @@ class TestDelete(test_api_base.BaseApiTest):
headers={api_base.Version.string: "1.5"})
self.assertEqual(http_client.ACCEPTED, response.status_int)
self.assertEqual(b'', response.body)
self.assertEqual(False, node.maintenance)
self.assertFalse(node.maintenance)
self.assertIsNone(node.maintenance_reason)
mock_get.assert_called_once_with(mock.ANY, node.name)
mock_update.assert_called_once_with(mock.ANY, mock.ANY,
@ -2227,7 +2227,7 @@ class TestPut(test_api_base.BaseApiTest):
request_body, headers=headers)
self.assertEqual(http_client.ACCEPTED, ret.status_code)
self.assertEqual(b'', ret.body)
self.assertEqual(True, self.node.maintenance)
self.assertTrue(self.node.maintenance)
self.assertEqual(reason, self.node.maintenance_reason)
mock_get.assert_called_once_with(mock.ANY, node_ident)
mock_update.assert_called_once_with(mock.ANY, mock.ANY,

2
ironic/tests/unit/api/v1/test_types.py
View File

@ -249,7 +249,7 @@ class TestJsonType(base.TestCase):
value = vt.validate(0.123)
self.assertEqual(0.123, value)
value = vt.validate(True)
self.assertEqual(True, value)
self.assertTrue(value)
value = vt.validate([1, 2, 3])
self.assertEqual([1, 2, 3], value)
value = vt.validate({'foo': 'bar'})

2
ironic/tests/unit/common/test_glance_service.py
View File

@ -235,7 +235,7 @@ class TestGlanceImageService(base.TestCase):
self.assertEqual(1, len(image_metas))
self.assertEqual('test image', image_metas[0]['name'])
self.assertEqual(False, image_metas[0]['is_public'])
self.assertFalse(image_metas[0]['is_public'])
def test_detail_marker(self):
fixtures = []

2
ironic/tests/unit/drivers/modules/test_seamicro.py
View File

@ -256,7 +256,7 @@ class SeaMicroPrivateMethodsTestCase(db_base.DbTestCase):
volume = self.Volume()
mock_get_volume.return_value = volume
valid = seamicro._validate_volume(self.info, volume.id)
self.assertEqual(valid, True)
self.assertTrue(valid)
@mock.patch.object(seamicro, "_get_pools", autospec=True)
def test__create_volume_fail(self, mock_get_pools):