openstack/python-heatclient
Code Issues Proposed changes

Replace assertEqual(None, *) with assertIsNone

Browse Source 
Replace assertEqual(None, *) with assertIsNone in tests to have
more clear messages in case of failure.

Change-Id: I9a30b67f0329280e06e746af9b82b448552a2a52
Closes-bug: #1280522
This commit is contained in:
Bo Wang
2016-02-16 20:35:23 +08:00
parent 6c18458764
commit 28f68b5d1c
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
heatclient/tests/unit/osc/v1/test_software_config.py
View File

@@ -260,8 +260,8 @@ class TestConfigShow(TestConfig):
self.mock_client.software_configs.get.assert_called_with(**{ self.mock_client.software_configs.get.assert_called_with(**{
'config_id': '96dfee3f-27b7-42ae-a03e-966226871ae6', 'config_id': '96dfee3f-27b7-42ae-a03e-966226871ae6',
}) })
self.assertEqual(None, columns) self.assertIsNone(columns)
self.assertEqual(None, data) self.assertIsNone(data)
def test_config_show_not_found(self): def test_config_show_not_found(self):
arglist = ['96dfee3f-27b7-42ae-a03e-966226871ae6'] arglist = ['96dfee3f-27b7-42ae-a03e-966226871ae6']

13
heatclient/tests/unit/test_format_utils.py
View File

@@ -92,21 +92,16 @@ abcde
self.assertEqual(expected, self.app.stdout.make_string()) self.assertEqual(expected, self.app.stdout.make_string())
def test_indent_and_truncate(self): def test_indent_and_truncate(self):
self.assertEqual( self.assertIsNone(format_utils.indent_and_truncate(None))
None, self.assertIsNone(format_utils.indent_and_truncate(None,
format_utils.indent_and_truncate(None)) truncate=True))
self.assertEqual(
None,
format_utils.indent_and_truncate(None, truncate=True))
self.assertEqual( self.assertEqual(
'', '',
format_utils.indent_and_truncate('')) format_utils.indent_and_truncate(''))
self.assertEqual( self.assertEqual(
'one', 'one',
format_utils.indent_and_truncate('one')) format_utils.indent_and_truncate('one'))
self.assertEqual( self.assertIsNone(format_utils.indent_and_truncate(None, spaces=2))
None,
format_utils.indent_and_truncate(None, spaces=2))
self.assertEqual( self.assertEqual(
'', '',
format_utils.indent_and_truncate('', spaces=2)) format_utils.indent_and_truncate('', spaces=2))