Pep8 cleanup

5 files changed, 28 insertions, 21 deletions

diff --git a/nova/tests/api/openstack/common.py b/nova/tests/api/openstack/common.py
index 66207cddc..3f9c7d3cf 100644
--- a/nova/tests/api/openstack/common.py
+++ b/nova/tests/api/openstack/common.py
@@ -19,14 +19,17 @@ import json
 
 import webob
 
+
 def webob_factory(url):
+    """Factory for removing duplicate webob code from tests"""
+
     base_url = url
+
     def web_request(url, method=None, body=None):
-        req = webob.Request.blank("%s%s" % (base_url, url)) 
+        req = webob.Request.blank("%s%s" % (base_url, url))
         if method:
             req.method = method
         if body:
             req.body = json.dumps(body)
         return req
     return web_request
-    
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 665551c55..4eb4a3c62 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -419,8 +419,9 @@ class ServersTest(unittest.TestCase):
         req = self.webreq('/1/action', 'POST', dict(resize=dict(flavorId=3)))
 
         self.resize_called = False
+
         def resize_mock(*args):
-            self.resize_called = True 
+            self.resize_called = True
 
         self.stubs.Set(nova.compute.api.API, 'resize', resize_mock)
 
@@ -432,8 +433,9 @@ class ServersTest(unittest.TestCase):
         req = self.webreq('/1/action', 'POST', dict(resize=dict(derp=3)))
 
         self.resize_called = False
+
         def resize_mock(*args):
-            self.resize_called = True 
+            self.resize_called = True
 
         self.stubs.Set(nova.compute.api.API, 'resize', resize_mock)
 
@@ -445,7 +447,7 @@ class ServersTest(unittest.TestCase):
         req = self.webreq('/1/action', 'POST', dict(resize=dict(flavorId=3)))
 
         def resize_mock(*args):
-            raise Exception, 'hurr durr'
+            raise Exception('hurr durr')
 
         self.stubs.Set(nova.compute.api.API, 'resize', resize_mock)
 
@@ -456,10 +458,11 @@ class ServersTest(unittest.TestCase):
         req = self.webreq('/1/action', 'POST', dict(confirmResize=None))
 
         self.resize_called = False
+
         def confirm_resize_mock(*args):
-            self.resize_called = True 
+            self.resize_called = True
 
-        self.stubs.Set(nova.compute.api.API, 'confirm_resize', 
+        self.stubs.Set(nova.compute.api.API, 'confirm_resize',
                 confirm_resize_mock)
 
         res = req.get_response(fakes.wsgi_app())
@@ -470,9 +473,9 @@ class ServersTest(unittest.TestCase):
         req = self.webreq('/1/action', 'POST', dict(confirmResize=None))
 
         def confirm_resize_mock(*args):
-            raise Exception, 'hurr durr'
+            raise Exception('hurr durr')
 
-        self.stubs.Set(nova.compute.api.API, 'confirm_resize', 
+        self.stubs.Set(nova.compute.api.API, 'confirm_resize',
                 confirm_resize_mock)
 
         res = req.get_response(fakes.wsgi_app())
@@ -482,10 +485,11 @@ class ServersTest(unittest.TestCase):
         req = self.webreq('/1/action', 'POST', dict(revertResize=None))
 
         self.resize_called = False
+
         def revert_resize_mock(*args):
             self.resize_called = True
 
-        self.stubs.Set(nova.compute.api.API, 'revert_resize', 
+        self.stubs.Set(nova.compute.api.API, 'revert_resize',
                 revert_resize_mock)
 
         res = req.get_response(fakes.wsgi_app())
@@ -496,9 +500,9 @@ class ServersTest(unittest.TestCase):
         req = self.webreq('/1/action', 'POST', dict(revertResize=None))
 
         def revert_resize_mock(*args):
-            raise Exception, 'hurr durr'
+            raise Exception('hurr durr')
 
-        self.stubs.Set(nova.compute.api.API, 'revert_resize', 
+        self.stubs.Set(nova.compute.api.API, 'revert_resize',
                 revert_resize_mock)
 
         res = req.get_response(fakes.wsgi_app())
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 3f2e64c87..5fd1ddaec 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -265,8 +265,7 @@ class ComputeTestCase(test.TestCase):
         instance_id = self._create_instance()
         context = self.context.elevated()
         self.compute.run_instance(self.context, instance_id)
-        db.instance_update(self.context, instance_id, {'host':'foo'})
-
+        db.instance_update(self.context, instance_id, {'host': 'foo'})
         self.compute.prep_resize(context, instance_id)
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance_id, 'pre-migrating')
@@ -279,7 +278,6 @@ class ComputeTestCase(test.TestCase):
         the same host"""
         instance_id = self._create_instance()
         self.compute.run_instance(self.context, instance_id)
-        self.assertRaises(exception.Error, self.compute.prep_resize, 
+        self.assertRaises(exception.Error, self.compute.prep_resize,
                 self.context, instance_id)
-
         self.compute.terminate_instance(self.context, instance_id)
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 3cbc01e5c..cb9b6620a 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -337,6 +337,7 @@ class XenAPIDiffieHellmanTestCase(test.TestCase):
     def tearDown(self):
         super(XenAPIDiffieHellmanTestCase, self).tearDown()
 
+
 class XenAPIMigrateInstance(test.TestCase):
     """
     Unit test for verifying migration-related actions
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 054fc434b..303c37eb9 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -171,8 +171,8 @@ class FakeSessionForVMTests(fake.SessionBase):
 
     def VM_destroy(self, session_ref, vm_ref):
         fake.destroy_vm(vm_ref)
-    
-    
+
+
 class FakeSessionForVolumeTests(fake.SessionBase):
     """ Stubs out a XenAPISession for Volume tests """
     def __init__(self, uri):
@@ -207,6 +207,7 @@ class FakeSessionForVolumeFailedTests(FakeSessionForVolumeTests):
     def SR_forget(self, _1, ref):
         pass
 
+
 class FakeSessionForMigrationTests(fake.SessionBase):
     """ Stubs out a XenAPISession for Migration tests """
     def __init__(self, uri):
@@ -232,8 +233,8 @@ def stub_out_migration_methods(stubs):
         vdi_ref = fake.create_vdi(name_label='derp', read_only=False,
                              sr_ref='herp', sharable=False)
         vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
-        return vdi_ref, {'uuid': vdi_rec['uuid']}
-    
+        return vdi_ref, {'uuid': vdi_rec['uuid'], }
+
     def fake_shutdown(self, inst, vm, method='clean'):
         pass
 
@@ -244,5 +245,5 @@ def stub_out_migration_methods(stubs):
     stubs.Set(vm_utils.VMHelper, 'scan_sr', fake_scan_sr)
     stubs.Set(vmops.VMOps, '_get_snapshot', fake_get_snapshot)
     stubs.Set(vm_utils.VMHelper, 'get_vdi_for_vm_safely', fake_get_vdi)
-    stubs.Set(xenapi_conn.XenAPISession, 'wait_for_task', lambda x,y,z: None)
+    stubs.Set(xenapi_conn.XenAPISession, 'wait_for_task', lambda x, y, z: None)
     stubs.Set(vmops.VMOps, '_shutdown', fake_shutdown)