diff options
| author | Sascha Peilicke <saschpe@suse.de> | 2012-06-25 17:33:25 +0200 |
|---|---|---|
| committer | Sascha Peilicke <saschpe@suse.de> | 2012-06-26 10:46:42 +0200 |
| commit | 2fa2cd2254a4044aaa584c4fcf5d6c3e1ec60d1f (patch) | |
| tree | 0ffd107b0f7468ca0b3b2e5171629dd9f65693ee /nova/tests | |
| parent | ca1f1d39b8ee85f55d5b656f7db946f855be5cb2 (diff) | |
Fix several PEP-8 issues
As found by pep8 version 1.2.
Change-Id: I5d40294416db0410fa7d9c82ea8efe8efadd0f58
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_aggregates.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/test_validator.py | 2 | ||||
| -rw-r--r-- | nova/tests/network/test_quantum.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_imagecache.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_metadata.py | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py index 080cf8428..fc19a9545 100644 --- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py +++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py @@ -52,7 +52,7 @@ class AggregateTestCase(test.TestCase): def test_index(self): def stub_list_aggregates(context): - if context == None: + if context is None: raise Exception() return AGGREGATE_LIST self.stubs.Set(self.controller.api, 'get_aggregate_list', diff --git a/nova/tests/api/test_validator.py b/nova/tests/api/test_validator.py index 875cb6de4..132e67e95 100644 --- a/nova/tests/api/test_validator.py +++ b/nova/tests/api/test_validator.py @@ -26,7 +26,7 @@ class ValidatorTestCase(test.TestCase): def test_validate(self): fixture = { - 'foo': lambda val: val == True + 'foo': lambda val: val is True } self.assertTrue( diff --git a/nova/tests/network/test_quantum.py b/nova/tests/network/test_quantum.py index 255444c7b..7f93c9c2b 100644 --- a/nova/tests/network/test_quantum.py +++ b/nova/tests/network/test_quantum.py @@ -492,7 +492,7 @@ class QuantumManagerTestCase(QuantumNovaTestCase): net = db.network_get_by_uuid(ctx.elevated(), net_id) self.assertTrue(net is not None) self.assertEquals(net['uuid'], net_id) - self.assertTrue(net['host'] != None) + self.assertTrue(net['host'] is not None) class QuantumNovaMACGenerationTestCase(QuantumNovaTestCase): diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index 43ee7ed93..9ab10cc51 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -429,7 +429,7 @@ class ImageCacheManagerTestCase(test.TestCase): image_cache_manager = imagecache.ImageCacheManager() res = image_cache_manager._verify_checksum( img, fname, create_if_missing=True) - self.assertTrue(res == None) + self.assertTrue(res is None) def test_verify_checksum_invalid(self): img = {'container_format': 'ami', 'id': '42'} diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py index c90e9c6c4..1d2cc37aa 100644 --- a/nova/tests/test_metadata.py +++ b/nova/tests/test_metadata.py @@ -66,7 +66,7 @@ def return_non_existing_address(*args, **kwarg): def fake_InstanceMetadata(stubs, inst_data, address=None, sgroups=None): - if sgroups == None: + if sgroups is None: sgroups = [{'name': 'default'}] def sg_get(*args, **kwargs): @@ -84,7 +84,7 @@ def fake_request(stubs, mdinst, relpath, address="127.0.0.1", app = handler.MetadataRequestHandler() - if fake_get_metadata == None: + if fake_get_metadata is None: fake_get_metadata = get_metadata if stubs: @@ -93,7 +93,7 @@ def fake_request(stubs, mdinst, relpath, address="127.0.0.1", request = webob.Request.blank(relpath) request.remote_addr = address - if headers != None: + if headers is not None: request.headers.update(headers) response = request.get_response(app) |