openstack/nova
Code Issues Proposed changes

pep cleanup

Browse Source
This commit is contained in:
Vishvananda Ishaya
2011-07-22 22:12:22 +00:00
parent 164afd5101
commit 4e4bbda2a1
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nova/context.py
View File

@@ -31,7 +31,8 @@ class RequestContext(object):
""" """
def __init__(self, user_id, project_id, is_admin=None, read_deleted=False, def __init__(self, user_id, project_id, is_admin=None, read_deleted=False,
roles=None, remote_address=None, timestamp=None, request_id=None): roles=None, remote_address=None, timestamp=None,
request_id=None):
self.user_id = user_id self.user_id = user_id
self.project_id = project_id self.project_id = project_id
self.roles = roles or [] self.roles = roles or []

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

@@ -1306,7 +1306,8 @@ class ServersTest(test.TestCase):
''' '''
def return_servers_with_host(context, *args, **kwargs): def return_servers_with_host(context, *args, **kwargs):
return [stub_instance(i, 'fake', 'fake', None, None, i % 2) for i in xrange(5)] return [stub_instance(i, 'fake', 'fake', None, None, i % 2)
for i in xrange(5)]
self.stubs.Set(nova.db.api, 'instance_get_all_by_project', self.stubs.Set(nova.db.api, 'instance_get_all_by_project',
return_servers_with_host) return_servers_with_host)

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

@@ -189,7 +189,8 @@ class ZonesTest(test.TestCase):
self.assertEqual(res_dict['zone']['cap2'], 'c;d') self.assertEqual(res_dict['zone']['cap2'], 'c;d')
def test_zone_select(self): def test_zone_select(self):
self.flags(build_plan_encryption_key='c286696d887c9aa0611bbb3e2025a45a') key = 'c286696d887c9aa0611bbb3e2025a45a'
self.flags(build_plan_encryption_key=key)
self.stubs.Set(api, 'select', zone_select) self.stubs.Set(api, 'select', zone_select)
req = webob.Request.blank('/v1.0/zones/select') req = webob.Request.blank('/v1.0/zones/select')

1
nova/tests/test_api.py
View File

@@ -395,7 +395,6 @@ class ApiEc2TestCase(test.TestCase):
self.expect_http() self.expect_http()
self.mox.ReplayAll() self.mox.ReplayAll()
security_group_name = "".join(random.choice("sdiuisudfsdcnpaqwertasd") security_group_name = "".join(random.choice("sdiuisudfsdcnpaqwertasd")
for x in range(random.randint(4, 8))) for x in range(random.randint(4, 8)))