Merge "Using assertIsNone() instead of assertEqual(None)"

This commit is contained in:
Jenkins 2016-11-27 11:31:59 +00:00 committed by Gerrit Code Review
commit a21036b148
3 changed files with 4 additions and 4 deletions

View File

@ -290,7 +290,7 @@ class NeutronSimpleDvsTest(test_plugin.NeutronDbPluginV2TestCase):
self.assertEqual(True, updated_net['shared'])
# Update the description attribute
self.assertEqual(None, network['description'])
self.assertIsNone(network['description'])
updated_net = self._plugin.update_network(
ctx, id,
{'network': {'description': 'test'}})

View File

@ -37,7 +37,7 @@ class NsxvAvailabilityZonesTestCase(base.BaseTestCase):
self.assertEqual("respool", az.resource_pool)
self.assertEqual("datastore", az.datastore_id)
self.assertEqual(True, az.edge_ha)
self.assertEqual(None, az.ha_datastore_id)
self.assertIsNone(az.ha_datastore_id)
def test_availability_zone_without_edge_ha(self):
az = nsx_az.ConfiguredAvailabilityZone(
@ -46,7 +46,7 @@ class NsxvAvailabilityZonesTestCase(base.BaseTestCase):
self.assertEqual("respool", az.resource_pool)
self.assertEqual("datastore", az.datastore_id)
self.assertEqual(False, az.edge_ha)
self.assertEqual(None, az.ha_datastore_id)
self.assertIsNone(az.ha_datastore_id)
def test_availability_fail_long_name(self):
self.assertRaises(

View File

@ -294,4 +294,4 @@ class TestNsxvFlowClassifierDriver(
self.assertTrue(mock_update_section.called)
section = mock_update_section.call_args[0][0]
# make sure the rule is not there
self.assertEqual(None, section.find('rule'))
self.assertIsNone(section.find('rule'))