From 87390bbb79418de76093aaa1f3f100614db75245 Mon Sep 17 00:00:00 2001 From: zhangyanxian Date: Wed, 28 Sep 2016 07:34:22 +0000 Subject: [PATCH] Using assertIsNone() instead of assertIs(None) Change-Id: Ia05b6a86ddc745f202d501f3ca4e07e33fc0890c --- astara/test/unit/api/test_neutron_wrapper.py | 4 ++-- astara/test/unit/test_notifications.py | 2 +- astara/test/unit/test_tenant.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/astara/test/unit/api/test_neutron_wrapper.py b/astara/test/unit/api/test_neutron_wrapper.py index 6685a475..f4fb4c77 100644 --- a/astara/test/unit/api/test_neutron_wrapper.py +++ b/astara/test/unit/api/test_neutron_wrapper.py @@ -157,7 +157,7 @@ class TestuNeutronModels(base.RugTestBase): } s = neutron.Subnet.from_dict(d) self.assertEqual(netaddr.IPNetwork('fe80::/64'), s.cidr) - self.assertIs(None, s.gateway_ip) + self.assertIsNone(s.gateway_ip) def test_subnet_gateway_not_ip(self): d = { @@ -175,7 +175,7 @@ class TestuNeutronModels(base.RugTestBase): } s = neutron.Subnet.from_dict(d) self.assertEqual(netaddr.IPNetwork('fe80::/64'), s.cidr) - self.assertIs(None, s.gateway_ip) + self.assertIsNone(s.gateway_ip) def test_subnet_cidr_none(self): d = { diff --git a/astara/test/unit/test_notifications.py b/astara/test/unit/test_notifications.py index a60e1152..3d3f25fb 100644 --- a/astara/test/unit/test_notifications.py +++ b/astara/test/unit/test_notifications.py @@ -233,7 +233,7 @@ class TestGetCRUD(base.RugTestBase): def test_notification_astara(self): e = self._get_event_notification('astara.bandwidth.used') - self.assertIs(None, e) + self.assertIsNone(e) def test_notification_cmd_poll(self): event_type = 'astara.command' diff --git a/astara/test/unit/test_tenant.py b/astara/test/unit/test_tenant.py index 2fe624de..274913cf 100644 --- a/astara/test/unit/test_tenant.py +++ b/astara/test/unit/test_tenant.py @@ -219,7 +219,7 @@ class TestTenantResourceManager(base.RugTestBase): self.trm.state_machines['1234'] = mock.Mock() self.trm._delete_resource(r) self.assertNotIn('1234', self.trm.state_machines) - self.assertIs(None, self.trm._default_resource_id) + self.assertIsNone(self.trm._default_resource_id) def test_delete_not_default_resource(self): r = event.Resource(