diff --git a/heat/tests/api/aws/test_api_ec2token.py b/heat/tests/api/aws/test_api_ec2token.py index 22d33a92b..a62770650 100644 --- a/heat/tests/api/aws/test_api_ec2token.py +++ b/heat/tests/api/aws/test_api_ec2token.py @@ -569,4 +569,4 @@ class Ec2TokenTest(common.HeatTestCase): def test_filter_factory_none_app(self): ec2_filter = ec2token.EC2Token_filter_factory(global_conf={}) - self.assertEqual(None, ec2_filter(None).application) + self.assertIsNone(ec2_filter(None).application) diff --git a/heat/tests/clients/test_sahara_client.py b/heat/tests/clients/test_sahara_client.py index 9f8f504f0..5e0cf9b54 100644 --- a/heat/tests/clients/test_sahara_client.py +++ b/heat/tests/clients/test_sahara_client.py @@ -125,7 +125,7 @@ class SaharaUtilsTests(common.HeatTestCase): error_name='NOT_FOUND') self.sahara_client.plugins.get.side_effect = side_effect - self.assertEqual(None, self.sahara_plugin.get_plugin_id(plugin_name)) + self.assertIsNone(self.sahara_plugin.get_plugin_id(plugin_name)) self.assertRaises(exception.EntityNotFound, self.sahara_plugin.get_plugin_id, 'noplugin') diff --git a/heat/tests/db/test_sqlalchemy_api.py b/heat/tests/db/test_sqlalchemy_api.py index fbed2aa67..af5a49ad1 100644 --- a/heat/tests/db/test_sqlalchemy_api.py +++ b/heat/tests/db/test_sqlalchemy_api.py @@ -2775,12 +2775,12 @@ class DBAPISyncPointTest(common.HeatTestCase): ret_sync_point_rsrc = db_api.sync_point_get( self.ctx, str(res.id), self.stack.current_traversal, True ) - self.assertEqual(None, ret_sync_point_rsrc) + self.assertIsNone(ret_sync_point_rsrc) ret_sync_point_stack = db_api.sync_point_get( self.ctx, self.stack.id, self.stack.current_traversal, True ) - self.assertEqual(None, ret_sync_point_stack) + self.assertIsNone(ret_sync_point_stack) class DBAPICryptParamsPropsTest(common.HeatTestCase): diff --git a/heat/tests/nova/test_server.py b/heat/tests/nova/test_server.py index 6801aaaab..3ffaeff07 100644 --- a/heat/tests/nova/test_server.py +++ b/heat/tests/nova/test_server.py @@ -3020,7 +3020,7 @@ class ServersTest(common.HeatTestCase): net = {'port': '2a60cbaa-3d33-4af6-a9ce-83594ac546fc'} net_id = server._get_network_id(net) - self.assertEqual(None, net_id) + self.assertIsNone(net_id) net = {'network': 'f3ef5d2f-d7ba-4b27-af66-58ca0b81e032', 'fixed_ip': '1.2.3.4'} @@ -3038,7 +3038,7 @@ class ServersTest(common.HeatTestCase): net = {'network': '', 'fixed_ip': '1.2.3.4'} net_id = server._get_network_id(net) - self.assertEqual(None, net_id) + self.assertIsNone(net_id) def test_get_network_id_nova(self): return_server = self.fc.servers.list()[3] @@ -3049,7 +3049,7 @@ class ServersTest(common.HeatTestCase): net = {'port': '2a60cbaa-3d33-4af6-a9ce-83594ac546fc'} net_id = server._get_network_id(net) - self.assertEqual(None, net_id) + self.assertIsNone(net_id) net = {'network': 'f3ef5d2f-d7ba-4b27-af66-58ca0b81e032', 'fixed_ip': '1.2.3.4'} diff --git a/heat/tests/test_none_resource.py b/heat/tests/test_none_resource.py index 3c96903dd..32122276a 100644 --- a/heat/tests/test_none_resource.py +++ b/heat/tests/test_none_resource.py @@ -40,7 +40,7 @@ outputs: self.assertEqual(self.rsrc.COMPLETE, self.rsrc.status) self.assertEqual(self.stack.CREATE, self.stack.action) self.assertEqual(self.stack.COMPLETE, self.stack.status) - self.assertEqual(None, self.stack.output('anything')) + self.assertIsNone(self.stack.output('anything')) def test_none_stack_create(self): self._create_none_stack() diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index c6a481ec3..36a1798c4 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -1849,7 +1849,7 @@ class ResourceTest(common.HeatTestCase): expected_rsrc_def = new_temp.resource_definitions(self.stack)[res.name] mock_update.assert_called_once_with(expected_rsrc_def) # ensure that current_template_id was not updated - self.assertEqual(None, res.current_template_id) + self.assertIsNone(res.current_template_id) # ensure that requires was not updated self.assertItemsEqual([2], res.requires) self._assert_resource_lock(res.id, None, 2) @@ -1949,7 +1949,7 @@ class ResourceTest(common.HeatTestCase): self.assertTrue(db_res.select_and_update.called) args, kwargs = db_res.select_and_update.call_args self.assertEqual({'replaces': None, 'needed_by': [4, 5]}, args[0]) - self.assertEqual(None, kwargs['expected_engine_id']) + self.assertIsNone(kwargs['expected_engine_id']) @mock.patch.object(resource_objects.Resource, 'get_obj') def test_update_replacement_data_ignores_rsrc_from_different_tmpl( diff --git a/heat/tests/test_software_config.py b/heat/tests/test_software_config.py index 3c78de46d..fe1fe5ae6 100644 --- a/heat/tests/test_software_config.py +++ b/heat/tests/test_software_config.py @@ -80,4 +80,4 @@ class SoftwareConfigTest(common.HeatTestCase): self.assertEqual( '#!/bin/bash', self.config._resolve_attribute('config')) self.rpc_client.show_software_config.side_effect = exc.NotFound - self.assertEqual(None, self.config._resolve_attribute('config')) + self.assertIsNone(self.config._resolve_attribute('config')) diff --git a/heat/tests/test_stack_update.py b/heat/tests/test_stack_update.py index ca9f0fdd9..749cf92e3 100644 --- a/heat/tests/test_stack_update.py +++ b/heat/tests/test_stack_update.py @@ -232,7 +232,7 @@ class StackUpdateTest(common.HeatTestCase): self.stack.update(updated_stack) self.assertEqual((stack.Stack.UPDATE, stack.Stack.COMPLETE), self.stack.state) - self.assertEqual(None, self.stack.tags) + self.assertIsNone(self.stack.tags) def test_update_modify_ok_replace(self): tmpl = {'HeatTemplateFormatVersion': '2012-12-12', diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py index fc9750b7c..99379d0a1 100644 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@ -86,7 +86,7 @@ class JsonToYamlTest(common.HeatTestCase): match = re.search('[\s,{]\d+\s*:', yml_str) # Check that there are no matches of integer-only keys # lacking explicit quotes - self.assertEqual(match, None) + self.assertIsNone(match) class YamlMinimalTest(common.HeatTestCase):