diff --git a/nova/hacking/checks.py b/nova/hacking/checks.py index c6e929402e88..5a3e2319f79a 100644 --- a/nova/hacking/checks.py +++ b/nova/hacking/checks.py @@ -51,9 +51,9 @@ asse_equal_type_re = re.compile( r"(.)*assertEqual\(type\((\w|\.|\'|\"|\[|\])+\), " "(\w|\.|\'|\"|\[|\])+\)") asse_equal_end_with_none_re = re.compile( - r"(.)*assertEqual\((\w|\.|\'|\"|\[|\])+, None\)") + r"assertEqual\(.*?,\s+None\)$") asse_equal_start_with_none_re = re.compile( - r"(.)*assertEqual\(None, (\w|\.|\'|\"|\[|\])+\)") + r"assertEqual\(None,") conf_attribute_set_re = re.compile(r"CONF\.[a-z0-9_.]+\s*=\s*\w") log_translation = re.compile( r"(.)*LOG\.(audit|error|info|warn|warning|critical|exception)\(\s*('|\")") @@ -250,8 +250,8 @@ def assert_equal_none(logical_line): N318 """ - res = (asse_equal_start_with_none_re.match(logical_line) or - asse_equal_end_with_none_re.match(logical_line)) + res = (asse_equal_start_with_none_re.search(logical_line) or + asse_equal_end_with_none_re.search(logical_line)) if res: yield (0, "N318: assertEqual(A, None) or assertEqual(None, A) " "sentences not allowed") diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py index 0912feafd96d..a42a8e4b171e 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/api/openstack/test_wsgi.py @@ -125,7 +125,7 @@ class RequestTest(test.NoDBTestCase): compute_nodes[1]) self.assertEqual(request.get_db_compute_node('id2'), compute_nodes[2]) - self.assertEqual(request.get_db_compute_node('id3'), None) + self.assertIsNone(request.get_db_compute_node('id3')) self.assertEqual(request.get_db_compute_nodes(), {'id0': compute_nodes[0], 'id1': compute_nodes[1], diff --git a/nova/tests/network/test_api.py b/nova/tests/network/test_api.py index 503db28bc9d2..a744325de725 100644 --- a/nova/tests/network/test_api.py +++ b/nova/tests/network/test_api.py @@ -517,9 +517,9 @@ class ApiTestCase(test.TestCase): @mock.patch('nova.objects.FixedIP.get_by_floating_address') def test_get_instance_by_floating_address_none(self, mock_get_by_floating): mock_get_by_floating.return_value = None - self.assertEqual(None, - self.network_api.get_instance_id_by_floating_address( - self.context, mock.sentinel.floating)) + self.assertIsNone( + self.network_api.get_instance_id_by_floating_address( + self.context, mock.sentinel.floating)) mock_get_by_floating.assert_called_once_with(self.context, mock.sentinel.floating) diff --git a/nova/tests/pci/test_pci_stats.py b/nova/tests/pci/test_pci_stats.py index 33f9ac4819c6..ffaf9ed6385c 100644 --- a/nova/tests/pci/test_pci_stats.py +++ b/nova/tests/pci/test_pci_stats.py @@ -237,7 +237,7 @@ class PciDeviceStatsWithTagsTestCase(test.NoDBTestCase): pci_dev_obj = objects.PciDevice.create(pci_dev) self.pci_stats.add_device(pci_dev_obj) # There should be no change - self.assertEqual(None, + self.assertIsNone( self.pci_stats._create_pool_keys_from_dev(pci_dev_obj)) self._assertPools() @@ -253,7 +253,7 @@ class PciDeviceStatsWithTagsTestCase(test.NoDBTestCase): pci_dev_obj = objects.PciDevice.create(pci_dev) self.pci_stats.remove_device(pci_dev_obj) # There should be no change - self.assertEqual(None, + self.assertIsNone( self.pci_stats._create_pool_keys_from_dev(pci_dev_obj)) self._assertPools() diff --git a/nova/tests/virt/libvirt/test_blockinfo.py b/nova/tests/virt/libvirt/test_blockinfo.py index 6657bba0832d..e37c479f750f 100644 --- a/nova/tests/virt/libvirt/test_blockinfo.py +++ b/nova/tests/virt/libvirt/test_blockinfo.py @@ -725,10 +725,10 @@ class LibvirtBlockInfoTest(test.TestCase): self.assertEqual('/dev/vda', blockinfo.get_device_name(driver_bdm)) bdm_obj.device_name = None - self.assertEqual(None, blockinfo.get_device_name(bdm_obj)) + self.assertIsNone(blockinfo.get_device_name(bdm_obj)) driver_bdm = driver_block_device.DriverVolumeBlockDevice(bdm_obj) - self.assertEqual(None, blockinfo.get_device_name(driver_bdm)) + self.assertIsNone(blockinfo.get_device_name(driver_bdm)) @mock.patch('nova.virt.libvirt.blockinfo.find_disk_dev_for_disk_bus', return_value='vda') diff --git a/nova/tests/virt/libvirt/test_imagebackend.py b/nova/tests/virt/libvirt/test_imagebackend.py index 4bf659cff654..36c375bf3d57 100644 --- a/nova/tests/virt/libvirt/test_imagebackend.py +++ b/nova/tests/virt/libvirt/test_imagebackend.py @@ -1287,6 +1287,6 @@ class UtilTestCase(test.NoDBTestCase): def test_get_hw_disk_discard(self): self.assertEqual('unmap', imagebackend.get_hw_disk_discard("unmap")) self.assertEqual('ignore', imagebackend.get_hw_disk_discard("ignore")) - self.assertEqual(None, imagebackend.get_hw_disk_discard(None)) + self.assertIsNone(imagebackend.get_hw_disk_discard(None)) self.assertRaises(RuntimeError, imagebackend.get_hw_disk_discard, "fake") diff --git a/nova/tests/virt/xenapi/test_volume_utils.py b/nova/tests/virt/xenapi/test_volume_utils.py index f0049a6b3367..02b33e05d0ff 100644 --- a/nova/tests/virt/xenapi/test_volume_utils.py +++ b/nova/tests/virt/xenapi/test_volume_utils.py @@ -37,9 +37,8 @@ class SROps(stubs.XenAPITestBaseNoDB): self.session = mock.Mock() self.session.XenAPI.Failure = UUIDException self.session.call_xenapi.side_effect = UUIDException - self.assertEqual(volume_utils.find_sr_by_uuid(self.session, - 'sr_uuid'), - None) + self.assertIsNone( + volume_utils.find_sr_by_uuid(self.session, 'sr_uuid')) def test_find_sr_from_vdi(self): vdi_ref = 'fake-ref' @@ -81,11 +80,9 @@ class ISCSIParametersTestCase(stubs.XenAPITestBaseNoDB): 'host') # There is no default value - self.assertEqual(volume_utils._get_target_host(':port'), - None) + self.assertIsNone(volume_utils._get_target_host(':port')) - self.assertEqual(volume_utils._get_target_host(None), - None) + self.assertIsNone(volume_utils._get_target_host(None)) def test_target_port(self): self.assertEqual(volume_utils._get_target_port('host:port'),