diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-29 10:18:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-29 10:18:34 +0000 |
| commit | 5d98817c23a5bec6688ea9866ea079d6d7e31180 (patch) | |
| tree | 9dcaabeda6f55c2b9c5a2994008e0037133c9d1e | |
| parent | 4f4575565cf0f93781f4fb273ad65342536c33c2 (diff) | |
| parent | 28f68b5d1c8819c88dcace044a42822739edd87e (diff) | |
| download | python-heatclient-5d98817c23a5bec6688ea9866ea079d6d7e31180.tar.gz | |
Merge "Replace assertEqual(None, *) with assertIsNone"
| -rw-r--r-- | heatclient/tests/unit/osc/v1/test_software_config.py | 4 | ||||
| -rw-r--r-- | heatclient/tests/unit/test_format_utils.py | 13 |
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)) |