summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBo Wang <bo.wang@easystack.cn>2016-02-16 20:35:23 +0800
committerBo Wang <bo.wang@easystack.cn>2016-02-29 10:57:02 +0800
commit28f68b5d1c8819c88dcace044a42822739edd87e (patch)
tree098b28087394cc856a215497a2aeeb9e01575301
parent6c184587648defb015c7dda7416b53721d71a9c7 (diff)
downloadpython-heatclient-28f68b5d1c8819c88dcace044a42822739edd87e.tar.gz
Replace assertEqual(None, *) with assertIsNone
Replace assertEqual(None, *) with assertIsNone in tests to have more clear messages in case of failure. Change-Id: I9a30b67f0329280e06e746af9b82b448552a2a52 Closes-bug: #1280522
-rw-r--r--heatclient/tests/unit/osc/v1/test_software_config.py4
-rw-r--r--heatclient/tests/unit/test_format_utils.py13
2 files changed, 6 insertions, 11 deletions
diff --git a/heatclient/tests/unit/osc/v1/test_software_config.py b/heatclient/tests/unit/osc/v1/test_software_config.py
index 1b4a9a5..df27780 100644
--- a/heatclient/tests/unit/osc/v1/test_software_config.py
+++ b/heatclient/tests/unit/osc/v1/test_software_config.py
@@ -260,8 +260,8 @@ class TestConfigShow(TestConfig):
self.mock_client.software_configs.get.assert_called_with(**{
'config_id': '96dfee3f-27b7-42ae-a03e-966226871ae6',
})
- self.assertEqual(None, columns)
- self.assertEqual(None, data)
+ self.assertIsNone(columns)
+ self.assertIsNone(data)
def test_config_show_not_found(self):
arglist = ['96dfee3f-27b7-42ae-a03e-966226871ae6']
diff --git a/heatclient/tests/unit/test_format_utils.py b/heatclient/tests/unit/test_format_utils.py
index 3962702..340a66c 100644
--- a/heatclient/tests/unit/test_format_utils.py
+++ b/heatclient/tests/unit/test_format_utils.py
@@ -92,21 +92,16 @@ abcde
self.assertEqual(expected, self.app.stdout.make_string())
def test_indent_and_truncate(self):
- self.assertEqual(
- None,
- format_utils.indent_and_truncate(None))
- self.assertEqual(
- None,
- format_utils.indent_and_truncate(None, truncate=True))
+ self.assertIsNone(format_utils.indent_and_truncate(None))
+ self.assertIsNone(format_utils.indent_and_truncate(None,
+ truncate=True))
self.assertEqual(
'',
format_utils.indent_and_truncate(''))
self.assertEqual(
'one',
format_utils.indent_and_truncate('one'))
- self.assertEqual(
- None,
- format_utils.indent_and_truncate(None, spaces=2))
+ self.assertIsNone(format_utils.indent_and_truncate(None, spaces=2))
self.assertEqual(
'',
format_utils.indent_and_truncate('', spaces=2))