diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-16 20:04:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-16 20:04:57 +0000 |
| commit | ee34849f091658dbb9adb73b7a31ad3ca85b4a01 (patch) | |
| tree | 24131e71cf5a3fd128e89057f87c15b686bd53ff /nova/tests | |
| parent | 6bfd2c7990650475cf10d0903ae79cf8fb67dfff (diff) | |
| parent | baf05561c4a43a3c361e6e0e9f68767150165244 (diff) | |
Merge "Pull resource extensions into APIRouter"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/v2/test_extensions.py | 11 | ||||
| -rw-r--r-- | nova/tests/integrated/test_extensions.py | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nova/tests/api/openstack/v2/test_extensions.py b/nova/tests/api/openstack/v2/test_extensions.py index 91c86bdad..650770f50 100644 --- a/nova/tests/api/openstack/v2/test_extensions.py +++ b/nova/tests/api/openstack/v2/test_extensions.py @@ -89,6 +89,7 @@ class ExtensionTestCase(test.TestCase): ext_list.append('nova.tests.api.openstack.v2.extensions.' 'foxinsocks.Foxinsocks') self.flags(osapi_extension=ext_list) + extensions.ExtensionManager.reset() class ExtensionControllerTest(ExtensionTestCase): @@ -227,7 +228,7 @@ class ResourceExtensionTest(ExtensionTestCase): def test_no_extension_present(self): manager = StubExtensionManager(None) - app = v2.APIRouter() + app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) request = webob.Request.blank("/blah") @@ -238,7 +239,7 @@ class ResourceExtensionTest(ExtensionTestCase): res_ext = extensions.ResourceExtension('tweedles', StubController(response_body)) manager = StubExtensionManager(res_ext) - app = v2.APIRouter() + app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) request = webob.Request.blank("/123/tweedles") @@ -250,7 +251,7 @@ class ResourceExtensionTest(ExtensionTestCase): res_ext = extensions.ResourceExtension('tweedles', StubController(response_body)) manager = StubExtensionManager(res_ext) - app = v2.APIRouter() + app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) request = webob.Request.blank("/123/tweedles") @@ -262,7 +263,7 @@ class ResourceExtensionTest(ExtensionTestCase): res_ext = extensions.ResourceExtension('tweedles', StubController(response_body)) manager = StubExtensionManager(res_ext) - app = v2.APIRouter() + app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) request = webob.Request.blank("/123/tweedles") @@ -283,7 +284,7 @@ class ResourceExtensionTest(ExtensionTestCase): res_ext = extensions.ResourceExtension('tweedles', StubController(response_body)) manager = StubExtensionManager(res_ext) - app = v2.APIRouter() + app = v2.APIRouter(manager) ext_midware = extensions.ExtensionMiddleware(app, manager) ser_midware = wsgi.LazySerializationMiddleware(ext_midware) request = webob.Request.blank("/123/tweedles/1") diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py index 4318e30f2..b10da166a 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/integrated/test_extensions.py @@ -17,6 +17,7 @@ import os +from nova.api.openstack.v2 import extensions from nova import flags from nova.log import logging from nova.tests.integrated import integrated_helpers @@ -28,6 +29,8 @@ LOG = logging.getLogger('nova.tests.integrated') class ExtensionsTest(integrated_helpers._IntegratedTestBase): def _get_flags(self): + extensions.ExtensionManager.reset() + f = super(ExtensionsTest, self)._get_flags() f['osapi_extension'] = FLAGS.osapi_extension[:] f['osapi_extension'].append('nova.tests.api.openstack.v2.extensions.' |