From 198af0ef9e65bc4c2efe74b9d93cf40210eb77bc Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Thu, 21 Oct 2010 14:29:34 -0400
Subject: Moves db writes into compute manager class. Cleans up sqlalchemy
 model/api to remove redundant calls for updating what is really a dict.

---
 nova/tests/api/openstack/fakes.py        | 1 +
 nova/tests/api/openstack/test_servers.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index 14170fbb2..f12c7b610 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -30,6 +30,7 @@ from nova import exception as exc
 import nova.api.openstack.auth
 from nova.image import service
 from nova.image.services import glance
+from nova.tests import fake_flags
 from nova.wsgi import Router
 
 
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index d1ee533b6..f4a09fd97 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -92,9 +92,7 @@ class ServersTest(unittest.TestCase):
             pass 
 
         def instance_create(context, inst):
-            class Foo(object):
-                internal_id = 1
-            return Foo()
+            return {'id': 1, 'internal_id': 1}
 
         def fake_method(*args, **kwargs):
             pass
-- 
cgit 


From d8d12549a5e47c7c44f449f12d6b556e2c56483d Mon Sep 17 00:00:00 2001
From: Eric Day <eday@oddments.org>
Date: Tue, 26 Oct 2010 15:37:32 -0700
Subject: More PEP8 fixes that were introduced in the last couple commits.

---
 nova/tests/api/openstack/test_api.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'nova/tests')

diff --git a/nova/tests/api/openstack/test_api.py b/nova/tests/api/openstack/test_api.py
index a8c0ff9f8..dd83991b9 100644
--- a/nova/tests/api/openstack/test_api.py
+++ b/nova/tests/api/openstack/test_api.py
@@ -24,22 +24,28 @@ from nova.api.openstack import API
 from nova.api.openstack import faults
 from webob import Request
 
+
 class APITest(unittest.TestCase):
 
     def test_exceptions_are_converted_to_faults(self):
+
         @webob.dec.wsgify
         def succeed(req):
             return 'Succeeded'
+
         @webob.dec.wsgify
         def raise_webob_exc(req):
             raise webob.exc.HTTPNotFound(explanation='Raised a webob.exc')
+
         @webob.dec.wsgify
         def fail(req):
             raise Exception("Threw an exception")
+
         @webob.dec.wsgify
         def raise_api_fault(req):
             exc = webob.exc.HTTPNotFound(explanation='Raised a webob.exc')
             return faults.Fault(exc)
+
         api = API()
 
         api.application = succeed
-- 
cgit