openstack/nova
Code Issues Proposed changes

fix pep8 issues

Browse Source
This commit is contained in:
William Wolf
2011-06-01 10:31:53 -04:00
parent b8f2f8d636
commit 3fa4ece45e
6 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
nova/tests/api/openstack/fakes.py
View File

@@ -168,8 +168,10 @@ def stub_out_glance(stubs, initial_fixtures=None):
def fake_get_images(self, filters=None, marker=None, limit=None): def fake_get_images(self, filters=None, marker=None, limit=None):
found = True found = True
if marker: found = False if marker:
if limit == 0: limit = None found = False
if limit == 0:
limit = None
fixtures = [] fixtures = []
count = 0 count = 0
@@ -188,8 +190,10 @@ def stub_out_glance(stubs, initial_fixtures=None):
def fake_get_images_detailed(self, filters=None, def fake_get_images_detailed(self, filters=None,
marker=None, limit=None): marker=None, limit=None):
found = True found = True
if marker: found = False if marker:
if limit == 0: limit = None found = False
if limit == 0:
limit = None
fixtures = [] fixtures = []
count = 0 count = 0
@@ -202,7 +206,6 @@ def stub_out_glance(stubs, initial_fixtures=None):
if f['id'] == marker: if f['id'] == marker:
found = True found = True
return fixtures return fixtures
def fake_get_image_meta(self, image_id): def fake_get_image_meta(self, image_id):

6
nova/tests/api/openstack/test_images.py
View File

@@ -302,8 +302,7 @@ class GlanceImageServiceTest(_BaseImageServiceTests):
for meta in image_metas: for meta in image_metas:
expected = {'id': 'DONTCARE', 'status': None, expected = {'id': 'DONTCARE', 'status': None,
'is_public': True, 'properties': { 'is_public': True, 'properties': {
'updated': None, 'created': None 'updated': None, 'created': None},
},
'name': 'TestImage %d' % (i)} 'name': 'TestImage %d' % (i)}
self.assertDictMatch(meta, expected) self.assertDictMatch(meta, expected)
i = i + 1 i = i + 1
@@ -333,8 +332,7 @@ class GlanceImageServiceTest(_BaseImageServiceTests):
for meta in image_metas: for meta in image_metas:
expected = {'id': 'DONTCARE', 'status': None, expected = {'id': 'DONTCARE', 'status': None,
'is_public': True, 'properties': { 'is_public': True, 'properties': {
'updated': None, 'created': None 'updated': None, 'created': None},
},
'name': 'TestImage %d' % (i)} 'name': 'TestImage %d' % (i)}
self.assertDictMatch(meta, expected) self.assertDictMatch(meta, expected)
i = i + 1 i = i + 1

3
nova/tests/api/openstack/test_servers.py
View File

@@ -774,8 +774,7 @@ class ServersTest(test.TestCase):
def server_update(context, id, params): def server_update(context, id, params):
filtered_dict = dict( filtered_dict = dict(
display_name='server_test' display_name='server_test')
)
self.assertEqual(params, filtered_dict) self.assertEqual(params, filtered_dict)
return filtered_dict return filtered_dict

9
nova/tests/integrated/test_servers.py
View File

@@ -194,8 +194,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
post = {} post = {}
post['rebuild'] = { post['rebuild'] = {
"imageRef": "https://localhost/v1.1/32278/images/2", "imageRef": "https://localhost/v1.1/32278/images/2",
"name": "blah" "name": "blah"}
}
self.api.post_server_action(created_server_id, post) self.api.post_server_action(created_server_id, post)
LOG.debug("rebuilt server: %s" % created_server) LOG.debug("rebuilt server: %s" % created_server)
@@ -224,8 +223,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
post = {} post = {}
post['rebuild'] = { post['rebuild'] = {
"imageRef": "https://localhost/v1.1/32278/images/2", "imageRef": "https://localhost/v1.1/32278/images/2",
"name": "blah" "name": "blah"}
}
metadata = {} metadata = {}
for i in range(30): for i in range(30):
@@ -267,8 +265,7 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
post = {} post = {}
post['rebuild'] = { post['rebuild'] = {
"imageRef": "https://localhost/v1.1/32278/images/2", "imageRef": "https://localhost/v1.1/32278/images/2",
"name": "blah" "name": "blah"}
}
metadata = {} metadata = {}
post['rebuild']['metadata'] = metadata post['rebuild']['metadata'] = metadata