Repository: libcloud Updated Branches: refs/heads/trunk 2821117f1 -> cd2faa7f9
tests: use assertIsNone Python 2.7 introduced assertIsNone(). Change all our "assertEqual(value, None)" statements to "assertIsNone(value)". Signed-off-by: Rick van de Loo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/2c8d7f5b Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/2c8d7f5b Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/2c8d7f5b Branch: refs/heads/trunk Commit: 2c8d7f5b7e78cbb7edddd9d317e7f052649b36a8 Parents: 2821117 Author: Ken Dreyer <[email protected]> Authored: Thu Nov 29 15:31:26 2018 -0700 Committer: Rick van de Loo <[email protected]> Committed: Fri Nov 30 08:46:36 2018 +0100 ---------------------------------------------------------------------- libcloud/test/common/test_base_driver.py | 6 +- libcloud/test/common/test_openstack_identity.py | 14 +- libcloud/test/common/test_upcloud.py | 4 +- libcloud/test/compute/test_azure.py | 2 +- libcloud/test/compute/test_cloudsigma_v2_0.py | 6 +- libcloud/test/compute/test_gce.py | 4 +- libcloud/test/compute/test_oneandone.py | 10 +- libcloud/test/compute/test_opennebula.py | 142 +++++++++---------- libcloud/test/compute/test_openstack.py | 26 ++-- libcloud/test/compute/test_vcloud.py | 2 +- libcloud/test/dns/test_buddyns.py | 16 +-- libcloud/test/dns/test_cloudflare.py | 2 +- libcloud/test/dns/test_dnspod.py | 10 +- libcloud/test/dns/test_google.py | 2 +- libcloud/test/dns/test_linode.py | 4 +- libcloud/test/dns/test_liquidweb.py | 10 +- libcloud/test/dns/test_luadns.py | 18 +-- libcloud/test/dns/test_nsone.py | 6 +- libcloud/test/dns/test_pointdns.py | 8 +- libcloud/test/dns/test_powerdns.py | 20 +-- libcloud/test/dns/test_vultr.py | 12 +- libcloud/test/dns/test_zerigo.py | 8 +- libcloud/test/dns/test_zonomi.py | 10 +- .../loadbalancer/test_dimensiondata_v2_3.py | 4 +- .../loadbalancer/test_dimensiondata_v2_4.py | 4 +- libcloud/test/test_connection.py | 16 +-- libcloud/test/test_http.py | 2 +- libcloud/test/test_init.py | 2 +- 28 files changed, 185 insertions(+), 185 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/common/test_base_driver.py ---------------------------------------------------------------------- diff --git a/libcloud/test/common/test_base_driver.py b/libcloud/test/common/test_base_driver.py index 5c51d94..b52975c 100644 --- a/libcloud/test/common/test_base_driver.py +++ b/libcloud/test/common/test_base_driver.py @@ -31,8 +31,8 @@ class BaseDriverTestCase(unittest.TestCase): DummyDriver1.connectionCls = Mock() DummyDriver1(key='foo') call_kwargs = DummyDriver1.connectionCls.call_args[1] - self.assertEqual(call_kwargs['timeout'], None) - self.assertEqual(call_kwargs['retry_delay'], None) + self.assertIsNone(call_kwargs['timeout']) + self.assertIsNone(call_kwargs['retry_delay']) # 2. Timeout provided as constructor argument class DummyDriver1(BaseDriver): @@ -42,7 +42,7 @@ class BaseDriverTestCase(unittest.TestCase): DummyDriver1(key='foo', timeout=12) call_kwargs = DummyDriver1.connectionCls.call_args[1] self.assertEqual(call_kwargs['timeout'], 12) - self.assertEqual(call_kwargs['retry_delay'], None) + self.assertIsNone(call_kwargs['retry_delay']) # 3. timeout provided via "_ex_connection_class_kwargs" method class DummyDriver2(BaseDriver): http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/common/test_openstack_identity.py ---------------------------------------------------------------------- diff --git a/libcloud/test/common/test_openstack_identity.py b/libcloud/test/common/test_openstack_identity.py index 91dba7e..3ed77bb 100644 --- a/libcloud/test/common/test_openstack_identity.py +++ b/libcloud/test/common/test_openstack_identity.py @@ -123,8 +123,8 @@ class OpenStackIdentityConnectionTestCase(unittest.TestCase): parent_conn=connection) self.assertEqual(osa.urls, {}) - self.assertEqual(osa.auth_token, None) - self.assertEqual(osa.auth_user_info, None) + self.assertIsNone(osa.auth_token) + self.assertIsNone(osa.auth_user_info) osa = osa.authenticate() self.assertTrue(len(osa.urls) >= 1) @@ -377,13 +377,13 @@ class OpenStackIdentity_3_0_ConnectionTests(unittest.TestCase): user = self.auth_instance.get_user(user_id='b') self.assertEqual(user.id, 'b') self.assertEqual(user.name, 'userwithoutemail') - self.assertEqual(user.email, None) + self.assertIsNone(user.email) def test_get_user_without_enabled(self): user = self.auth_instance.get_user(user_id='c') self.assertEqual(user.id, 'c') self.assertEqual(user.name, 'userwithoutenabled') - self.assertEqual(user.enabled, None) + self.assertIsNone(user.enabled) def test_create_user(self): user = self.auth_instance.create_user(email='test2@localhost', password='test1', @@ -527,7 +527,7 @@ class OpenStackServiceCatalogTestCase(unittest.TestCase): entry = [e for e in entries if e.service_type == 'cloudFilesCDN'][0] self.assertEqual(entry.service_type, 'cloudFilesCDN') - self.assertEqual(entry.service_name, None) + self.assertIsNone(entry.service_name) self.assertEqual(len(entry.endpoints), 2) self.assertEqual(entry.endpoints[0].region, 'ORD') self.assertEqual(entry.endpoints[0].url, @@ -550,7 +550,7 @@ class OpenStackServiceCatalogTestCase(unittest.TestCase): self.assertEqual(entry.service_type, 'compute') self.assertEqual(entry.service_name, 'cloudServers') self.assertEqual(len(entry.endpoints), 1) - self.assertEqual(entry.endpoints[0].region, None) + self.assertIsNone(entry.endpoints[0].region) self.assertEqual(entry.endpoints[0].url, 'https://servers.api.rackspacecloud.com/v1.0/1337') self.assertEqual(entry.endpoints[0].endpoint_type, 'external') @@ -566,7 +566,7 @@ class OpenStackServiceCatalogTestCase(unittest.TestCase): self.assertEqual(len(entries), 6) entry = [e for e in entries if e.service_type == 'volume'][0] self.assertEqual(entry.service_type, 'volume') - self.assertEqual(entry.service_name, None) + self.assertIsNone(entry.service_name) self.assertEqual(len(entry.endpoints), 3) self.assertEqual(entry.endpoints[0].region, 'regionOne') self.assertEqual(entry.endpoints[0].endpoint_type, 'external') http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/common/test_upcloud.py ---------------------------------------------------------------------- diff --git a/libcloud/test/common/test_upcloud.py b/libcloud/test/common/test_upcloud.py index 60a9ea9..f21a39a 100644 --- a/libcloud/test/common/test_upcloud.py +++ b/libcloud/test/common/test_upcloud.py @@ -276,10 +276,10 @@ class TestPlanPrice(unittest.TestCase): def test_plan_not_found_in_zone(self): location = NodeLocation(id='no_such_location', name='', country='', driver=None) - self.assertEqual(self.pp.get_price('1xCPU-1GB', location), None) + self.assertIsNone(self.pp.get_price('1xCPU-1GB', location)) def test_no_location_given(self): - self.assertEqual(self.pp.get_price('1xCPU-1GB'), None) + self.assertIsNone(self.pp.get_price('1xCPU-1GB')) if __name__ == '__main__': http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/compute/test_azure.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_azure.py b/libcloud/test/compute/test_azure.py index 0d59866..d4a7355 100644 --- a/libcloud/test/compute/test_azure.py +++ b/libcloud/test/compute/test_azure.py @@ -111,7 +111,7 @@ class AzureNodeDriverTests(LibcloudTestCase): self.assertEqual(img0.name, "dc03") self.assertListEqual(img0.public_ips, ["191.235.135.62"]) self.assertListEqual(img0.private_ips, ["100.92.66.69"]) - self.assertEqual(img0.size, None) + self.assertIsNone(img0.size) self.assertEqual(img0.state, NodeState.RUNNING) self.assertTrue(isinstance(img0.extra, dict)) extra = img0.extra http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/compute/test_cloudsigma_v2_0.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_cloudsigma_v2_0.py b/libcloud/test/compute/test_cloudsigma_v2_0.py index b50216b..b97ccec 100644 --- a/libcloud/test/compute/test_cloudsigma_v2_0.py +++ b/libcloud/test/compute/test_cloudsigma_v2_0.py @@ -219,9 +219,9 @@ class CloudSigmaAPI20BaseTestCase(object): self.assertEqual(rule.direction, 'out') self.assertEqual(rule.dst_ip, '23.0.0.0/32') self.assertEqual(rule.ip_proto, 'tcp') - self.assertEqual(rule.dst_port, None) - self.assertEqual(rule.src_ip, None) - self.assertEqual(rule.src_port, None) + self.assertIsNone(rule.dst_port) + self.assertIsNone(rule.src_ip) + self.assertIsNone(rule.src_port) self.assertEqual(rule.comment, 'Drop traffic from the VM to IP address 23.0.0.0/32') def test_ex_create_firewall_policy_no_rules(self): http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/compute/test_gce.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_gce.py b/libcloud/test/compute/test_gce.py index 5874d00..974a648 100644 --- a/libcloud/test/compute/test_gce.py +++ b/libcloud/test/compute/test_gce.py @@ -60,7 +60,7 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin): self.driver = GCENodeDriver(*GCE_PARAMS, **kwargs) def test_default_scopes(self): - self.assertEqual(self.driver.scopes, None) + self.assertIsNone(self.driver.scopes) def test_timestamp_to_datetime(self): timestamp1 = '2013-06-26T10:05:19.340-07:00' @@ -2157,7 +2157,7 @@ class GCENodeDriverTest(GoogleTestCase, TestCaseMixin): self.assertFalse(zone.next_mw_duration) zone_no_mw = self.driver.ex_get_zone('us-central1-a') - self.assertEqual(zone_no_mw.time_until_mw, None) + self.assertIsNone(zone_no_mw.time_until_mw) class GCEMockHttp(MockHttp): http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/compute/test_oneandone.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_oneandone.py b/libcloud/test/compute/test_oneandone.py index 7de5e38..db7ff44 100644 --- a/libcloud/test/compute/test_oneandone.py +++ b/libcloud/test/compute/test_oneandone.py @@ -114,7 +114,7 @@ class OneAndOneTests(unittest.TestCase): self.assertEqual(node.name, "Docs Content Test Server: CentOS 7-1") self.assertEqual(node.extra["description"], "My server description") - self.assertEqual(node.extra["status"]["percent"], None) + self.assertIsNone(node.extra["status"]["percent"]) self.assertEqual(node.extra["status"]["state"], "POWERED_ON") self.assertEqual(node.extra["image"]["id"], @@ -142,11 +142,11 @@ class OneAndOneTests(unittest.TestCase): "FDBE99EDD57F8596CBF71B6B64BD0A92") self.assertEqual(node.extra["ips"][0]["ip"], "62.151.179.99") - self.assertEqual(node.extra["monitoring_policy"], None) + self.assertIsNone(node.extra["monitoring_policy"]) self.assertEqual(node.extra["alerts"], []) - self.assertEqual(node.extra["snapshot"], None) - self.assertEqual(node.extra["dvd"], None) - self.assertEqual(node.extra["private_networks"], None) + self.assertIsNone(node.extra["snapshot"]) + self.assertIsNone(node.extra["dvd"]) + self.assertIsNone(node.extra["private_networks"]) def test_ex_list_datacenters(self): datacenters = self.driver.ex_list_datacenters() http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/compute/test_opennebula.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_opennebula.py b/libcloud/test/compute/test_opennebula.py index beae4be..05c64ed 100644 --- a/libcloud/test/compute/test_opennebula.py +++ b/libcloud/test/compute/test_opennebula.py @@ -75,11 +75,11 @@ class OpenNebula_1_4_Tests(unittest.TestCase): self.assertEqual(node.name, 'Compute 5') self.assertEqual(node.state, OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE']) - self.assertEqual(node.public_ips[0].name, None) + self.assertIsNone(node.public_ips[0].name) self.assertEqual(node.public_ips[0].id, '5') self.assertEqual(node.public_ips[0].address, '192.168.0.1') self.assertEqual(node.public_ips[0].size, 1) - self.assertEqual(node.public_ips[1].name, None) + self.assertIsNone(node.public_ips[1].name) self.assertEqual(node.public_ips[1].id, '15') self.assertEqual(node.public_ips[1].address, '192.168.1.1') self.assertEqual(node.public_ips[1].size, 1) @@ -108,11 +108,11 @@ class OpenNebula_1_4_Tests(unittest.TestCase): self.assertEqual(node.state, OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE']) self.assertEqual(node.public_ips[0].id, '5') - self.assertEqual(node.public_ips[0].name, None) + self.assertIsNone(node.public_ips[0].name) self.assertEqual(node.public_ips[0].address, '192.168.0.1') self.assertEqual(node.public_ips[0].size, 1) self.assertEqual(node.public_ips[1].id, '15') - self.assertEqual(node.public_ips[1].name, None) + self.assertIsNone(node.public_ips[1].name) self.assertEqual(node.public_ips[1].address, '192.168.1.1') self.assertEqual(node.public_ips[1].size, 1) self.assertEqual(node.private_ips, []) @@ -124,11 +124,11 @@ class OpenNebula_1_4_Tests(unittest.TestCase): self.assertEqual(node.state, OpenNebulaNodeDriver.NODE_STATE_MAP['ACTIVE']) self.assertEqual(node.public_ips[0].id, '5') - self.assertEqual(node.public_ips[0].name, None) + self.assertIsNone(node.public_ips[0].name) self.assertEqual(node.public_ips[0].address, '192.168.0.2') self.assertEqual(node.public_ips[0].size, 1) self.assertEqual(node.public_ips[1].id, '15') - self.assertEqual(node.public_ips[1].name, None) + self.assertIsNone(node.public_ips[1].name) self.assertEqual(node.public_ips[1].address, '192.168.1.2') self.assertEqual(node.public_ips[1].size, 1) self.assertEqual(node.private_ips, []) @@ -140,15 +140,15 @@ class OpenNebula_1_4_Tests(unittest.TestCase): self.assertEqual(node.state, NodeState.UNKNOWN) self.assertEqual(node.public_ips[0].id, '5') - self.assertEqual(node.public_ips[0].name, None) + self.assertIsNone(node.public_ips[0].name) self.assertEqual(node.public_ips[0].address, '192.168.0.3') self.assertEqual(node.public_ips[0].size, 1) self.assertEqual(node.public_ips[1].id, '15') - self.assertEqual(node.public_ips[1].name, None) + self.assertIsNone(node.public_ips[1].name) self.assertEqual(node.public_ips[1].address, '192.168.1.3') self.assertEqual(node.public_ips[1].size, 1) self.assertEqual(node.private_ips, []) - self.assertEqual(node.image, None) + self.assertIsNone(node.image) def test_list_images(self): """ @@ -180,24 +180,24 @@ class OpenNebula_1_4_Tests(unittest.TestCase): size = sizes[0] self.assertEqual(size.id, '1') self.assertEqual(size.name, 'small') - self.assertEqual(size.ram, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.ram) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[1] self.assertEqual(size.id, '2') self.assertEqual(size.name, 'medium') - self.assertEqual(size.ram, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.ram) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[2] self.assertEqual(size.id, '3') self.assertEqual(size.name, 'large') - self.assertEqual(size.ram, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.ram) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) def test_list_locations(self): """ @@ -335,10 +335,10 @@ class OpenNebula_2_0_Tests(unittest.TestCase): self.assertTrue(node.size.vcpu is None or isinstance(node.size.vcpu, int)) self.assertEqual(node.size.cpu, 1) - self.assertEqual(node.size.vcpu, None) - self.assertEqual(node.size.disk, None) - self.assertEqual(node.size.bandwidth, None) - self.assertEqual(node.size.price, None) + self.assertIsNone(node.size.vcpu) + self.assertIsNone(node.size.disk) + self.assertIsNone(node.size.bandwidth) + self.assertIsNone(node.size.price) self.assertTrue(len([image for image in self.driver.list_images() if image.id == node.image.id]) == 1) self.assertEqual(node.image.id, '5') @@ -373,10 +373,10 @@ class OpenNebula_2_0_Tests(unittest.TestCase): self.assertTrue(node.size.vcpu is None or isinstance(node.size.vcpu, int)) self.assertEqual(node.size.cpu, 1) - self.assertEqual(node.size.vcpu, None) - self.assertEqual(node.size.disk, None) - self.assertEqual(node.size.bandwidth, None) - self.assertEqual(node.size.price, None) + self.assertIsNone(node.size.vcpu) + self.assertIsNone(node.size.disk) + self.assertIsNone(node.size.bandwidth) + self.assertIsNone(node.size.price) self.assertTrue(len([image for image in self.driver.list_images() if image.id == node.image.id]) == 1) self.assertEqual(node.image.id, '15') @@ -401,8 +401,8 @@ class OpenNebula_2_0_Tests(unittest.TestCase): self.assertEqual(node.public_ips[1].size, 1) self.assertEqual(node.public_ips[1].extra['mac'], '02:00:c0:a8:01:03') self.assertEqual(node.private_ips, []) - self.assertEqual(node.size, None) - self.assertEqual(node.image, None) + self.assertIsNone(node.size) + self.assertIsNone(node.image) context = node.extra['context'] self.assertEqual(context, {}) @@ -442,10 +442,10 @@ class OpenNebula_2_0_Tests(unittest.TestCase): self.assertTrue(size.cpu is None or isinstance(size.cpu, int)) self.assertTrue(size.vcpu is None or isinstance(size.vcpu, int)) self.assertEqual(size.cpu, 1) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[1] self.assertEqual(size.id, '2') self.assertEqual(size.name, 'medium') @@ -453,10 +453,10 @@ class OpenNebula_2_0_Tests(unittest.TestCase): self.assertTrue(size.cpu is None or isinstance(size.cpu, int)) self.assertTrue(size.vcpu is None or isinstance(size.vcpu, int)) self.assertEqual(size.cpu, 4) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[2] self.assertEqual(size.id, '3') self.assertEqual(size.name, 'large') @@ -464,19 +464,19 @@ class OpenNebula_2_0_Tests(unittest.TestCase): self.assertTrue(size.cpu is None or isinstance(size.cpu, int)) self.assertTrue(size.vcpu is None or isinstance(size.vcpu, int)) self.assertEqual(size.cpu, 8) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[3] self.assertEqual(size.id, '4') self.assertEqual(size.name, 'custom') self.assertEqual(size.ram, 0) self.assertEqual(size.cpu, 0) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) def test_list_locations(self): """ @@ -588,10 +588,10 @@ class OpenNebula_3_2_Tests(unittest.TestCase): self.assertTrue(size.cpu is None or isinstance(size.cpu, float)) self.assertTrue(size.vcpu is None or isinstance(size.vcpu, int)) self.assertEqual(size.cpu, 1) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[1] self.assertEqual(size.id, '2') self.assertEqual(size.name, 'medium') @@ -599,10 +599,10 @@ class OpenNebula_3_2_Tests(unittest.TestCase): self.assertTrue(size.cpu is None or isinstance(size.cpu, float)) self.assertTrue(size.vcpu is None or isinstance(size.vcpu, int)) self.assertEqual(size.cpu, 4) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[2] self.assertEqual(size.id, '3') self.assertEqual(size.name, 'large') @@ -610,10 +610,10 @@ class OpenNebula_3_2_Tests(unittest.TestCase): self.assertTrue(size.cpu is None or isinstance(size.cpu, float)) self.assertTrue(size.vcpu is None or isinstance(size.vcpu, int)) self.assertEqual(size.cpu, 8) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) class OpenNebula_3_6_Tests(unittest.TestCase): @@ -710,30 +710,30 @@ class OpenNebula_3_8_Tests(unittest.TestCase): self.assertEqual(size.name, 'small') self.assertEqual(size.ram, 1024) self.assertEqual(size.cpu, 1) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[1] self.assertEqual(size.id, '2') self.assertEqual(size.name, 'medium') self.assertEqual(size.ram, 4096) self.assertEqual(size.cpu, 4) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) size = sizes[2] self.assertEqual(size.id, '3') self.assertEqual(size.name, 'large') self.assertEqual(size.ram, 8192) self.assertEqual(size.cpu, 8) - self.assertEqual(size.vcpu, None) - self.assertEqual(size.disk, None) - self.assertEqual(size.bandwidth, None) - self.assertEqual(size.price, None) + self.assertIsNone(size.vcpu) + self.assertIsNone(size.disk) + self.assertIsNone(size.bandwidth) + self.assertIsNone(size.price) class OpenNebula_1_4_MockHttp(MockHttp): http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/compute/test_openstack.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_openstack.py b/libcloud/test/compute/test_openstack.py index 4119749..78c13e0 100644 --- a/libcloud/test/compute/test_openstack.py +++ b/libcloud/test/compute/test_openstack.py @@ -293,7 +293,7 @@ class OpenStack_1_0_Tests(TestCaseMixin, unittest.TestCase): driver=self.driver) node = self.driver.create_node(name='racktest', image=image, size=size) self.assertEqual(node.name, 'racktest') - self.assertEqual(node.extra.get('password'), None) + self.assertIsNone(node.extra.get('password')) def test_create_node_ex_shared_ip_group(self): OpenStackMockHttp.type = 'EX_SHARED_IP_GROUP' @@ -815,7 +815,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.driver_klass.connectionCls.conn_class.type = 'ERROR_STATE_NO_IMAGE_ID' nodes = self.driver.list_nodes() - self.assertEqual(nodes[0].extra['imageId'], None) + self.assertIsNone(nodes[0].extra['imageId']) def test_list_volumes(self): volumes = self.driver.list_volumes() @@ -1150,10 +1150,10 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): image = self.driver.get_image(image_id) self.assertEqual(image.id, image_id) self.assertEqual(image.name, 'Windows 2008 SP2 x86 (B24)') - self.assertEqual(image.extra['serverId'], None) + self.assertIsNone(image.extra['serverId']) self.assertEqual(image.extra['minDisk'], "5") self.assertEqual(image.extra['minRam'], "256") - self.assertEqual(image.extra['visibility'], None) + self.assertIsNone(image.extra['visibility']) def test_delete_image(self): image = NodeImage( @@ -1255,7 +1255,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual(security_group_rule.from_port, 14) self.assertEqual(security_group_rule.to_port, 16) self.assertEqual(security_group_rule.ip_range, '0.0.0.0/0') - self.assertEqual(security_group_rule.tenant_id, None) + self.assertIsNone(security_group_rule.tenant_id) def test_ex_delete_security_group_rule(self): security_group_rule = OpenStackSecurityGroupRule( @@ -1271,7 +1271,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual( keypair.fingerprint, '5d:66:33:ae:99:0f:fb:cb:86:f2:bc:ae:53:99:b6:ed') self.assertTrue(len(keypair.public_key) > 10) - self.assertEqual(keypair.private_key, None) + self.assertIsNone(keypair.private_key) def test_get_key_pair(self): key_pair = self.driver.get_key_pair(name='test-key-pair') @@ -1304,7 +1304,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual( keypair.fingerprint, '97:10:a6:e7:92:65:7e:69:fe:e6:81:8f:39:3c:8f:5a') self.assertEqual(keypair.public_key, pub_key) - self.assertEqual(keypair.private_key, None) + self.assertIsNone(keypair.private_key) def test_import_key_pair_from_string(self): name = 'key3' @@ -1317,7 +1317,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual( keypair.fingerprint, '97:10:a6:e7:92:65:7e:69:fe:e6:81:8f:39:3c:8f:5a') self.assertEqual(keypair.public_key, pub_key) - self.assertEqual(keypair.private_key, None) + self.assertIsNone(keypair.private_key) def test_delete_key_pair(self): keypair = OpenStackKeyPair( @@ -1359,7 +1359,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual(ret[0].id, '09ea1784-2f81-46dc-8c91-244b4df75bde') self.assertEqual(ret[0].pool, pool) self.assertEqual(ret[0].ip_address, '10.3.1.42') - self.assertEqual(ret[0].node_id, None) + self.assertIsNone(ret[0].node_id) self.assertEqual(ret[1].id, '04c5336a-0629-4694-ba30-04b0bdfa88a4') self.assertEqual(ret[1].pool, pool) self.assertEqual(ret[1].ip_address, '10.3.1.1') @@ -1373,7 +1373,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual(ret.id, '09ea1784-2f81-46dc-8c91-244b4df75bde') self.assertEqual(ret.pool, pool) self.assertEqual(ret.ip_address, '10.3.1.42') - self.assertEqual(ret.node_id, None) + self.assertIsNone(ret.node_id) def test_OpenStack_1_1_FloatingIpPool_create_floating_ip(self): pool = OpenStack_1_1_FloatingIpPool('foo', self.driver.connection) @@ -1382,7 +1382,7 @@ class OpenStack_1_1_Tests(unittest.TestCase, TestCaseMixin): self.assertEqual(ret.id, '09ea1784-2f81-46dc-8c91-244b4df75bde') self.assertEqual(ret.pool, pool) self.assertEqual(ret.ip_address, '10.3.1.42') - self.assertEqual(ret.node_id, None) + self.assertIsNone(ret.node_id) def test_OpenStack_1_1_FloatingIpPool_delete_floating_ip(self): pool = OpenStack_1_1_FloatingIpPool('foo', self.driver.connection) @@ -1600,7 +1600,7 @@ class OpenStack_2_Tests(OpenStack_1_1_Tests): image = self.driver.get_image(image_id) self.assertEqual(image.id, image_id) self.assertEqual(image.name, 'hypernode') - self.assertEqual(image.extra['serverId'], None) + self.assertIsNone(image.extra['serverId']) self.assertEqual(image.extra['minDisk'], 40) self.assertEqual(image.extra['minRam'], 0) self.assertEqual(image.extra['visibility'], "shared") @@ -1629,7 +1629,7 @@ class OpenStack_2_Tests(OpenStack_1_1_Tests): } image = self.driver.ex_update_image(image_id, data) self.assertEqual(image.name, 'hypernode') - self.assertEqual(image.extra['serverId'], None) + self.assertIsNone(image.extra['serverId']) self.assertEqual(image.extra['minDisk'], 40) self.assertEqual(image.extra['minRam'], 0) self.assertEqual(image.extra['visibility'], "shared") http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/compute/test_vcloud.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_vcloud.py b/libcloud/test/compute/test_vcloud.py index 91175b2..21b6f62 100644 --- a/libcloud/test/compute/test_vcloud.py +++ b/libcloud/test/compute/test_vcloud.py @@ -232,7 +232,7 @@ class VCloud_1_5_Tests(unittest.TestCase, TestCaseMixin): node = self.driver.ex_find_node('testNode', self.driver.vdcs[0]) self.assertEqual(node.name, "testNode") node = self.driver.ex_find_node('testNonExisting', self.driver.vdcs[0]) - self.assertEqual(node, None) + self.assertIsNone(node) def test_ex_add_vm_disk__with_invalid_values(self): self.assertRaises( http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_buddyns.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_buddyns.py b/libcloud/test/dns/test_buddyns.py index bf10b78..12f8f40 100644 --- a/libcloud/test/dns/test_buddyns.py +++ b/libcloud/test/dns/test_buddyns.py @@ -32,15 +32,15 @@ class BuddyNSDNSTests(unittest.TestCase): zone = zones[0] self.assertEqual(zone.id, 'microsoft.com') - self.assertEqual(zone.type, None) + self.assertIsNone(zone.type) self.assertEqual(zone.domain, 'microsoft.com') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) zone = zones[1] self.assertEqual(zone.id, 'google.de') - self.assertEqual(zone.type, None) + self.assertIsNone(zone.type) self.assertEqual(zone.domain, 'google.de') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) def test_delete_zone_zone_does_not_exist(self): BuddyNSMockHttp.type = 'DELETE_ZONE_ZONE_DOES_NOT_EXIST' @@ -75,8 +75,8 @@ class BuddyNSDNSTests(unittest.TestCase): self.assertEqual(zone.id, 'myexample.com') self.assertEqual(zone.domain, 'myexample.com') - self.assertEqual(zone.type, None) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.type) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) def test_create_zone_success(self): @@ -85,8 +85,8 @@ class BuddyNSDNSTests(unittest.TestCase): self.assertEqual(zone.id, 'microsoft.com') self.assertEqual(zone.domain, 'microsoft.com') - self.assertEqual(zone.type, None), - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.type), + self.assertIsNone(zone.ttl) def test_create_zone_zone_already_exists(self): BuddyNSMockHttp.type = 'CREATE_ZONE_ZONE_ALREADY_EXISTS' http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_cloudflare.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_cloudflare.py b/libcloud/test/dns/test_cloudflare.py index 53ff755..3a17fc8 100644 --- a/libcloud/test/dns/test_cloudflare.py +++ b/libcloud/test/dns/test_cloudflare.py @@ -59,7 +59,7 @@ class CloudFlareDNSDriverTestCase(unittest.TestCase): record = records[0] self.assertEqual(record.id, '364797364') - self.assertEqual(record.name, None) + self.assertIsNone(record.name) self.assertEqual(record.type, 'A') self.assertEqual(record.data, '192.30.252.153') http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_dnspod.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_dnspod.py b/libcloud/test/dns/test_dnspod.py index 8369120..99130f0 100644 --- a/libcloud/test/dns/test_dnspod.py +++ b/libcloud/test/dns/test_dnspod.py @@ -41,7 +41,7 @@ class DNSPodDNSTests(unittest.TestCase): zone = zones[0] self.assertEqual(zone.id, '6') self.assertEqual(zone.domain, 'dnspod.com') - self.assertEqual(zone.type, None) + self.assertIsNone(zone.type) self.assertEqual(zone.driver, self.driver) self.assertEqual(zone.ttl, '600') @@ -61,7 +61,7 @@ class DNSPodDNSTests(unittest.TestCase): self.assertEqual(zone.id, '6') self.assertEqual(zone.domain, 'dnspod.com') - self.assertEqual(zone.type, None) + self.assertIsNone(zone.type) self.assertEqual(zone.ttl, '600') self.assertEqual(zone.driver, self.driver) @@ -89,8 +89,8 @@ class DNSPodDNSTests(unittest.TestCase): self.assertEqual(zone.id, '3') self.assertEqual(zone.domain, 'api2.com') - self.assertEqual(zone.type, None) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.type) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) def test_create_zone_zone_zone_already_exists(self): @@ -151,7 +151,7 @@ class DNSPodDNSTests(unittest.TestCase): self.assertEqual(record.id, '50') self.assertEqual(record.name, '@') self.assertEqual(record.data, '96.126.115.73') - self.assertEqual(record.ttl, None) + self.assertIsNone(record.ttl) def test_create_record_already_exists_error(self): DNSPodMockHttp.type = 'RECORD_EXISTS' http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_google.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_google.py b/libcloud/test/dns/test_google.py index 6559924..434a10b 100644 --- a/libcloud/test/dns/test_google.py +++ b/libcloud/test/dns/test_google.py @@ -40,7 +40,7 @@ class GoogleTests(GoogleTestCase): self.driver = GoogleDNSDriver(*DNS_PARAMS_GOOGLE, **kwargs) def test_default_scopes(self): - self.assertEqual(self.driver.scopes, None) + self.assertIsNone(self.driver.scopes) def test_list_zones(self): zones = self.driver.list_zones() http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_linode.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_linode.py b/libcloud/test/dns/test_linode.py index 678149d..ee24d80 100644 --- a/libcloud/test/dns/test_linode.py +++ b/libcloud/test/dns/test_linode.py @@ -52,7 +52,7 @@ class LinodeTests(unittest.TestCase): self.assertEqual(zone.id, '5093') self.assertEqual(zone.type, 'master') self.assertEqual(zone.domain, 'linode.com') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) self.assertHasKeys(zone.extra, ['description', 'SOA_Email', 'status']) def test_list_records_success(self): @@ -95,7 +95,7 @@ class LinodeTests(unittest.TestCase): self.assertEqual(zone.id, '5093') self.assertEqual(zone.type, 'master') self.assertEqual(zone.domain, 'linode.com') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) self.assertHasKeys(zone.extra, ['description', 'SOA_Email', 'status']) def test_get_zone_does_not_exist(self): http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_liquidweb.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_liquidweb.py b/libcloud/test/dns/test_liquidweb.py index 95e4b78..2ce2b59 100644 --- a/libcloud/test/dns/test_liquidweb.py +++ b/libcloud/test/dns/test_liquidweb.py @@ -61,21 +61,21 @@ class LiquidWebTests(unittest.TestCase): self.assertEqual(zone.domain, 'blogtest.com') self.assertEqual(zone.type, 'NATIVE') self.assertEqual(zone.driver, self.driver) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) second_zone = zones[1] self.assertEqual(second_zone.id, '378449') self.assertEqual(second_zone.domain, 'oltjanotest.com') self.assertEqual(second_zone.type, 'NATIVE') self.assertEqual(second_zone.driver, self.driver) - self.assertEqual(second_zone.ttl, None) + self.assertIsNone(second_zone.ttl) third_zone = zones[2] self.assertEqual(third_zone.id, '378450') self.assertEqual(third_zone.domain, 'pythontest.com') self.assertEqual(third_zone.type, 'NATIVE') self.assertEqual(third_zone.driver, self.driver) - self.assertEqual(third_zone.ttl, None) + self.assertIsNone(third_zone.ttl) def test_get_zone_zone_does_not_exist(self): LiquidWebMockHttp.type = 'ZONE_DOES_NOT_EXIST' @@ -94,7 +94,7 @@ class LiquidWebTests(unittest.TestCase): self.assertEqual(zone.id, '13') self.assertEqual(zone.domain, 'blogtest.com') self.assertEqual(zone.type, 'NATIVE') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) def test_delete_zone_success(self): @@ -122,7 +122,7 @@ class LiquidWebTests(unittest.TestCase): self.assertEqual(zone.id, '13') self.assertEqual(zone.domain, 'test.com') self.assertEqual(zone.type, 'NATIVE') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) def test_create_zone_zone_zone_already_exists(self): http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_luadns.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_luadns.py b/libcloud/test/dns/test_luadns.py index 03ee898..e7f5ca0 100644 --- a/libcloud/test/dns/test_luadns.py +++ b/libcloud/test/dns/test_luadns.py @@ -44,16 +44,16 @@ class LuadnsTests(unittest.TestCase): zone = zones[0] self.assertEqual(zone.id, '1') self.assertEqual(zone.domain, 'example.com') - self.assertEqual(zone.type, None) + self.assertIsNone(zone.type) self.assertEqual(zone.driver, self.driver) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) second_zone = zones[1] self.assertEqual(second_zone.id, '2') self.assertEqual(second_zone.domain, 'example.net') - self.assertEqual(second_zone.type, None) + self.assertIsNone(second_zone.type) self.assertEqual(second_zone.driver, self.driver) - self.assertEqual(second_zone.ttl, None) + self.assertIsNone(second_zone.ttl) def test_get_zone_zone_does_not_exist(self): LuadnsMockHttp.type = 'ZONE_DOES_NOT_EXIST' @@ -71,8 +71,8 @@ class LuadnsTests(unittest.TestCase): self.assertEqual(zone.id, '31') self.assertEqual(zone.domain, 'example.org') - self.assertEqual(zone.type, None) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.type) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) def test_delete_zone_success(self): @@ -99,8 +99,8 @@ class LuadnsTests(unittest.TestCase): self.assertEqual(zone.id, '3') self.assertEqual(zone.domain, 'example.org') - self.assertEqual(zone.type, None) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.type) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) def test_create_zone_zone_zone_already_exists(self): @@ -189,7 +189,7 @@ class LuadnsTests(unittest.TestCase): self.assertEqual(record.id, '31') self.assertEqual(record.name, 'test.com.') self.assertEqual(record.data, '127.0.0.1') - self.assertEqual(record.ttl, None) + self.assertIsNone(record.ttl) def test_record_already_exists_error(self): pass http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_nsone.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_nsone.py b/libcloud/test/dns/test_nsone.py index 91f8b00..d4a6dee 100644 --- a/libcloud/test/dns/test_nsone.py +++ b/libcloud/test/dns/test_nsone.py @@ -35,13 +35,13 @@ class NsOneTests(unittest.TestCase): zone = zones[0] self.assertEqual(zone.id, '520422af9f782d37dffb588b') - self.assertEqual(zone.type, None) + self.assertIsNone(zone.type) self.assertEqual(zone.domain, 'example.com') self.assertEqual(zone.ttl, 3600) zone = zones[1] self.assertEqual(zone.id, '520422c99f782d37dffb5892') - self.assertEqual(zone.type, None) + self.assertIsNone(zone.type) self.assertEqual(zone.domain, 'nsoneisgreat.com') self.assertEqual(zone.ttl, 3600) @@ -78,7 +78,7 @@ class NsOneTests(unittest.TestCase): self.assertEqual(zone.id, '52051b2c9f782d58bb4df41b') self.assertEqual(zone.domain, 'newzone.com') - self.assertEqual(zone.type, None), + self.assertIsNone(zone.type), self.assertEqual(zone.ttl, 3600) def test_create_zone_zone_already_exists(self): http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_pointdns.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_pointdns.py b/libcloud/test/dns/test_pointdns.py index 3a8180d..17a7b8c 100644 --- a/libcloud/test/dns/test_pointdns.py +++ b/libcloud/test/dns/test_pointdns.py @@ -278,7 +278,7 @@ class PointDNSTests(unittest.TestCase): self.assertEqual(redirect1.name, 'redirect2.domain1.com.') self.assertEqual(redirect1.type, '302') self.assertEqual(redirect1.data, 'http://other.com') - self.assertEqual(redirect1.iframe, None) + self.assertIsNone(redirect1.iframe) self.assertEqual(redirect1.query, False) self.assertEqual(zone, redirect1.zone) @@ -287,7 +287,7 @@ class PointDNSTests(unittest.TestCase): self.assertEqual(redirect2.name, 'redirect1.domain1.com.') self.assertEqual(redirect2.type, '302') self.assertEqual(redirect2.data, 'http://someother.com') - self.assertEqual(redirect2.iframe, None) + self.assertIsNone(redirect2.iframe) self.assertEqual(redirect2.query, False) self.assertEqual(zone, redirect1.zone) @@ -377,7 +377,7 @@ class PointDNSTests(unittest.TestCase): self.assertEqual(redirect.name, 'redirect2.domain1.com.') self.assertEqual(redirect.type, '302') self.assertEqual(redirect.data, 'http://other.com') - self.assertEqual(redirect.iframe, None) + self.assertIsNone(redirect.iframe) self.assertEqual(redirect.query, False) self.assertEqual(zone.id, redirect.zone.id) @@ -442,7 +442,7 @@ class PointDNSTests(unittest.TestCase): self.assertEqual(_redirect.name, 'redirect3.domain1.com.') self.assertEqual(_redirect.type, '302') self.assertEqual(_redirect.data, 'http://updatedother.com') - self.assertEqual(_redirect.iframe, None) + self.assertIsNone(_redirect.iframe) self.assertEqual(_redirect.query, False) self.assertEqual(zone.id, _redirect.zone.id) http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_powerdns.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_powerdns.py b/libcloud/test/dns/test_powerdns.py index f871a4e..2235031 100644 --- a/libcloud/test/dns/test_powerdns.py +++ b/libcloud/test/dns/test_powerdns.py @@ -46,7 +46,7 @@ class PowerDNSTestCase(LibcloudTestCase): type=RecordType.A, data='192.0.5.4', extra={'ttl': 86400}) - self.assertEqual(record.id, None) + self.assertIsNone(record.id) self.assertEqual(record.name, 'newrecord.example.com') self.assertEqual(record.data, '192.0.5.4') self.assertEqual(record.type, RecordType.A) @@ -57,8 +57,8 @@ class PowerDNSTestCase(LibcloudTestCase): zone = self.driver.create_zone('example.org', extra=extra) self.assertEqual(zone.id, 'example.org.') self.assertEqual(zone.domain, 'example.org') - self.assertEqual(zone.type, None) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.type) + self.assertIsNone(zone.ttl) def test_delete_record(self): self.assertTrue(self.test_record.delete()) @@ -74,8 +74,8 @@ class PowerDNSTestCase(LibcloudTestCase): zone = self.driver.get_zone('example.com.') self.assertEqual(zone.id, 'example.com.') self.assertEqual(zone.domain, 'example.com') - self.assertEqual(zone.type, None) - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.type) + self.assertIsNone(zone.ttl) def test_list_record_types(self): result = self.driver.list_record_types() @@ -89,12 +89,12 @@ class PowerDNSTestCase(LibcloudTestCase): zones = self.driver.list_zones() self.assertEqual(zones[0].id, 'example.com.') self.assertEqual(zones[0].domain, 'example.com') - self.assertEqual(zones[0].type, None) - self.assertEqual(zones[0].ttl, None) + self.assertIsNone(zones[0].type) + self.assertIsNone(zones[0].ttl) self.assertEqual(zones[1].id, 'example.net.') self.assertEqual(zones[1].domain, 'example.net') - self.assertEqual(zones[1].type, None) - self.assertEqual(zones[1].ttl, None) + self.assertIsNone(zones[1].type) + self.assertIsNone(zones[1].ttl) def test_update_record(self): record = self.driver.update_record(self.test_record, @@ -102,7 +102,7 @@ class PowerDNSTestCase(LibcloudTestCase): type=RecordType.A, data='127.0.0.1', extra={'ttl': 300}) - self.assertEqual(record.id, None) + self.assertIsNone(record.id) self.assertEqual(record.name, 'newrecord.example.com') self.assertEqual(record.data, '127.0.0.1') self.assertEqual(record.type, RecordType.A) http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_vultr.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_vultr.py b/libcloud/test/dns/test_vultr.py index 2a1a848..fdb26de 100644 --- a/libcloud/test/dns/test_vultr.py +++ b/libcloud/test/dns/test_vultr.py @@ -53,25 +53,25 @@ class VultrTests(unittest.TestCase): self.assertEqual(zone.id, 'example.com') self.assertEqual(zone.type, 'master') self.assertEqual(zone.domain, 'example.com') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) zone = zones[1] self.assertEqual(zone.id, 'zupo.com') self.assertEqual(zone.type, 'master') self.assertEqual(zone.domain, 'zupo.com') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) zone = zones[2] self.assertEqual(zone.id, 'oltjano.com') self.assertEqual(zone.type, 'master') self.assertEqual(zone.domain, 'oltjano.com') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) zone = zones[3] self.assertEqual(zone.id, '13.com') self.assertEqual(zone.type, 'master') self.assertEqual(zone.domain, '13.com') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) def test_get_zone_zone_does_not_exist(self): VultrMockHttp.type = 'GET_ZONE_ZONE_DOES_NOT_EXIST' @@ -90,7 +90,7 @@ class VultrTests(unittest.TestCase): self.assertEqual(zone.id, 'zupo.com') self.assertEqual(zone.domain, 'zupo.com') self.assertEqual(zone.type, 'master') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) def test_delete_zone_zone_does_not_exist(self): VultrMockHttp.type = 'DELETE_ZONE_ZONE_DOES_NOT_EXIST' @@ -116,7 +116,7 @@ class VultrTests(unittest.TestCase): self.assertEqual(zone.id, 'test.com') self.assertEqual(zone.domain, 'test.com') self.assertEqual(zone.type, 'master'), - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) def test_create_zone_zone_already_exists(self): VultrMockHttp.type = 'CREATE_ZONE_ZONE_ALREADY_EXISTS' http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_zerigo.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_zerigo.py b/libcloud/test/dns/test_zerigo.py index 37c0326..2a223bd 100644 --- a/libcloud/test/dns/test_zerigo.py +++ b/libcloud/test/dns/test_zerigo.py @@ -69,8 +69,8 @@ class ZerigoTests(unittest.TestCase): self.assertEqual(records[0].type, RecordType.A) self.assertEqual(records[0].data, '172.16.16.1') self.assertEqual(records[0].extra['fqdn'], 'www.example.com') - self.assertEqual(records[0].extra['notes'], None) - self.assertEqual(records[0].extra['priority'], None) + self.assertIsNone(records[0].extra['notes']) + self.assertIsNone(records[0].extra['priority']) self.assertEqual(records[1].name, 'test') self.assertEqual(records[1].extra['ttl'], 3600) @@ -80,8 +80,8 @@ class ZerigoTests(unittest.TestCase): record1 = list(self.driver.list_records(zone=zone))[-1] record2 = list(self.driver.list_records(zone=zone))[-2] - self.assertEqual(record1.name, None) - self.assertEqual(record2.name, None) + self.assertIsNone(record1.name) + self.assertIsNone(record2.name) def test_list_records_no_results(self): zone = self.driver.list_zones()[0] http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/dns/test_zonomi.py ---------------------------------------------------------------------- diff --git a/libcloud/test/dns/test_zonomi.py b/libcloud/test/dns/test_zonomi.py index 302ead3..c8e19f4 100644 --- a/libcloud/test/dns/test_zonomi.py +++ b/libcloud/test/dns/test_zonomi.py @@ -64,21 +64,21 @@ class ZonomiTests(unittest.TestCase): self.assertEqual(zone.id, 'thegamertest.com') self.assertEqual(zone.domain, 'thegamertest.com') self.assertEqual(zone.type, 'master') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) second_zone = zones[1] self.assertEqual(second_zone.id, 'lonelygamer.com') self.assertEqual(second_zone.domain, 'lonelygamer.com') self.assertEqual(second_zone.type, 'master') - self.assertEqual(second_zone.ttl, None) + self.assertIsNone(second_zone.ttl) self.assertEqual(second_zone.driver, self.driver) third_zone = zones[2] self.assertEqual(third_zone.id, 'gamertest.com') self.assertEqual(third_zone.domain, 'gamertest.com') self.assertEqual(third_zone.type, 'master') - self.assertEqual(third_zone.ttl, None) + self.assertIsNone(third_zone.ttl) self.assertEqual(third_zone.driver, self.driver) def test_get_zone_GET_ZONE_DOES_NOT_EXIST(self): @@ -98,7 +98,7 @@ class ZonomiTests(unittest.TestCase): self.assertEqual(zone.id, 'gamertest.com') self.assertEqual(zone.domain, 'gamertest.com') self.assertEqual(zone.type, 'master') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) self.assertEqual(zone.driver, self.driver) def test_delete_zone_DELETE_ZONE_DOES_NOT_EXIST(self): @@ -135,7 +135,7 @@ class ZonomiTests(unittest.TestCase): self.assertEqual(zone.id, 'myzone.com') self.assertEqual(zone.domain, 'myzone.com') self.assertEqual(zone.type, 'master') - self.assertEqual(zone.ttl, None) + self.assertIsNone(zone.ttl) def test_list_records_empty_list(self): ZonomiMockHttp.type = 'LIST_RECORDS_EMPTY_LIST' http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/loadbalancer/test_dimensiondata_v2_3.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_dimensiondata_v2_3.py b/libcloud/test/loadbalancer/test_dimensiondata_v2_3.py index 2467373..8546bef 100644 --- a/libcloud/test/loadbalancer/test_dimensiondata_v2_3.py +++ b/libcloud/test/loadbalancer/test_dimensiondata_v2_3.py @@ -81,7 +81,7 @@ class DimensionData_v2_3_Tests(unittest.TestCase): self.assertEqual(balancer.name, 'test') self.assertEqual(balancer.id, '8334f461-0df0-42d5-97eb-f4678eb26bea') self.assertEqual(balancer.ip, '165.180.12.22') - self.assertEqual(balancer.port, None) + self.assertIsNone(balancer.port) self.assertEqual(balancer.extra['pool_id'], '9e6b496d-5261-4542-91aa-b50c7f569c54') self.assertEqual(balancer.extra['network_domain_id'], '1234') @@ -186,7 +186,7 @@ class DimensionData_v2_3_Tests(unittest.TestCase): extra=None) member = self.driver.balancer_attach_member(balancer, member) self.assertEqual(member.id, '3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0') - self.assertEqual(member.port, None) + self.assertIsNone(member.port) def test_balancer_detach_member(self): extra = {'pool_id': '4d360b1f-bc2c-4ab7-9884-1f03ba2768f7', http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/loadbalancer/test_dimensiondata_v2_4.py ---------------------------------------------------------------------- diff --git a/libcloud/test/loadbalancer/test_dimensiondata_v2_4.py b/libcloud/test/loadbalancer/test_dimensiondata_v2_4.py index b45ecc6..d2eb472 100644 --- a/libcloud/test/loadbalancer/test_dimensiondata_v2_4.py +++ b/libcloud/test/loadbalancer/test_dimensiondata_v2_4.py @@ -81,7 +81,7 @@ class DimensionData_v2_4_Tests(unittest.TestCase): self.assertEqual(balancer.name, 'test') self.assertEqual(balancer.id, '8334f461-0df0-42d5-97eb-f4678eb26bea') self.assertEqual(balancer.ip, '165.180.12.22') - self.assertEqual(balancer.port, None) + self.assertIsNone(balancer.port) self.assertEqual(balancer.extra['pool_id'], '9e6b496d-5261-4542-91aa-b50c7f569c54') self.assertEqual(balancer.extra['network_domain_id'], '1234') @@ -186,7 +186,7 @@ class DimensionData_v2_4_Tests(unittest.TestCase): extra=None) member = self.driver.balancer_attach_member(balancer, member) self.assertEqual(member.id, '3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0') - self.assertEqual(member.port, None) + self.assertIsNone(member.port) def test_balancer_detach_member(self): extra = {'pool_id': '4d360b1f-bc2c-4ab7-9884-1f03ba2768f7', http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/test_connection.py ---------------------------------------------------------------------- diff --git a/libcloud/test/test_connection.py b/libcloud/test/test_connection.py index be50f1c..60d9e34 100644 --- a/libcloud/test/test_connection.py +++ b/libcloud/test/test_connection.py @@ -48,8 +48,8 @@ class BaseConnectionClassTestCase(unittest.TestCase): self.assertEqual(result[0], 'http') self.assertEqual(result[1], '127.0.0.1') self.assertEqual(result[2], 3128) - self.assertEqual(result[3], None) - self.assertEqual(result[4], None) + self.assertIsNone(result[3]) + self.assertIsNone(result[4]) proxy_url = 'http://user1:[email protected]:3128' result = conn._parse_proxy_url(proxy_url=proxy_url) @@ -93,9 +93,9 @@ class BaseConnectionClassTestCase(unittest.TestCase): _ = os.environ.pop('http_proxy', None) conn = LibcloudConnection(host='localhost', port=80) - self.assertEqual(conn.proxy_scheme, None) - self.assertEqual(conn.proxy_host, None) - self.assertEqual(conn.proxy_port, None) + self.assertIsNone(conn.proxy_scheme) + self.assertIsNone(conn.proxy_host) + self.assertIsNone(conn.proxy_port) proxy_url = 'http://127.0.0.3:3128' conn.set_http_proxy(proxy_url=proxy_url) @@ -120,9 +120,9 @@ class BaseConnectionClassTestCase(unittest.TestCase): def test_connection_to_unusual_port(self): conn = LibcloudConnection(host='localhost', port=8080) - self.assertEqual(conn.proxy_scheme, None) - self.assertEqual(conn.proxy_host, None) - self.assertEqual(conn.proxy_port, None) + self.assertIsNone(conn.proxy_scheme) + self.assertIsNone(conn.proxy_host) + self.assertIsNone(conn.proxy_port) self.assertEqual(conn.host, 'http://localhost:8080') conn = LibcloudConnection(host='localhost', port=80) http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/test_http.py ---------------------------------------------------------------------- diff --git a/libcloud/test/test_http.py b/libcloud/test/test_http.py index 2e9eeb1..3b17e5f 100644 --- a/libcloud/test/test_http.py +++ b/libcloud/test/test_http.py @@ -80,7 +80,7 @@ class TestHttpLibSSLTests(unittest.TestCase): self.httplib_object.verify = False self.httplib_object._setup_ca_cert() - self.assertEqual(self.httplib_object.ca_cert, None) + self.assertIsNone(self.httplib_object.ca_cert) # verify = True, a valid path is provided, self.ca_cert should be set to # a valid path http://git-wip-us.apache.org/repos/asf/libcloud/blob/2c8d7f5b/libcloud/test/test_init.py ---------------------------------------------------------------------- diff --git a/libcloud/test/test_init.py b/libcloud/test/test_init.py index 5a8db75..a49f61a 100644 --- a/libcloud/test/test_init.py +++ b/libcloud/test/test_init.py @@ -40,7 +40,7 @@ class TestUtils(unittest.TestCase): # Debug mode is disabled _init_once() - self.assertEqual(LoggingConnection.log, None) + self.assertIsNone(LoggingConnection.log) if have_paramiko: paramiko_log_level = paramiko_logger.getEffectiveLevel()
