openstack/nova
Code Issues Proposed changes

Reconcile tests with latest trunk merges.

Browse Source
This commit is contained in:
Dan Prince 2011-03-24 13:56:25 -04:00
parent 6e434be050
commit e5069f27cd
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/api-paste.ini
View File

@ -86,7 +86,7 @@ paste.filter_factory = nova.api.openstack.auth:AuthMiddleware.factory
paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory paste.filter_factory = nova.api.openstack.limits:RateLimitingMiddleware.factory
[filter:extensions] [filter:extensions]
paste.filter_factory = nova.api.openstack.extensions:ExtensionsRouter.factory paste.filter_factory = nova.api.openstack.extensions:ExtensionMiddleware.factory
[app:osapiapp10] [app:osapiapp10]
paste.app_factory = nova.api.openstack:APIRouterV10.factory paste.app_factory = nova.api.openstack:APIRouterV10.factory

4
nova/tests/api/openstack/extensions/foxinsocks.py
View File

@ -73,7 +73,7 @@ class Foxinsocks(object):
data['flavor']['googoose'] = "Gooey goo for chewy chewing!" data['flavor']['googoose'] = "Gooey goo for chewy chewing!"
return data return data
resp_ext = extensions.ResponseExtension('GET', '/v1.0/flavors/:(id)', resp_ext = extensions.ResponseExtension('GET', '/v1.1/flavors/:(id)',
_goose_handler) _goose_handler)
response_exts.append(resp_ext) response_exts.append(resp_ext)
@ -84,7 +84,7 @@ class Foxinsocks(object):
data['big_bands'] = 'Pig Bands!' data['big_bands'] = 'Pig Bands!'
return data return data
resp_ext2 = extensions.ResponseExtension('GET', '/v1.0/flavors/:(id)', resp_ext2 = extensions.ResponseExtension('GET', '/v1.1/flavors/:(id)',
_bands_handler) _bands_handler)
response_exts.append(resp_ext2) response_exts.append(resp_ext2)
return response_exts return response_exts

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

@ -193,6 +193,10 @@ class ResponseExtensionTest(unittest.TestCase):
fakes.stub_out_auth(self.stubs) fakes.stub_out_auth(self.stubs)
self.context = context.get_admin_context() self.context = context.get_admin_context()
def tearDown(self):
self.stubs.UnsetAll()
super(ResponseExtensionTest, self).tearDown()
def test_get_resources_with_stub_mgr(self): def test_get_resources_with_stub_mgr(self):
test_resp = "Gooey goo for chewy chewing!" test_resp = "Gooey goo for chewy chewing!"
@ -204,13 +208,14 @@ class ResponseExtensionTest(unittest.TestCase):
return data return data
resp_ext = extensions.ResponseExtension('GET', resp_ext = extensions.ResponseExtension('GET',
'/v1.0/flavors/:(id)', '/v1.1/flavors/:(id)',
_resp_handler) _resp_handler)
manager = StubExtensionManager(None, None, resp_ext) manager = StubExtensionManager(None, None, resp_ext)
app = fakes.wsgi_app() app = fakes.wsgi_app()
ext_midware = extensions.ExtensionMiddleware(app, manager) ext_midware = extensions.ExtensionMiddleware(app, manager)
request = webob.Request.blank("/v1.0/flavors/1") request = webob.Request.blank("/v1.1/flavors/1")
request.environ['api.version'] = '1.1'
response = request.get_response(ext_midware) response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int) self.assertEqual(200, response.status_int)
response_data = json.loads(response.body) response_data = json.loads(response.body)
@ -222,10 +227,10 @@ class ResponseExtensionTest(unittest.TestCase):
app = fakes.wsgi_app() app = fakes.wsgi_app()
ext_midware = extensions.ExtensionMiddleware(app) ext_midware = extensions.ExtensionMiddleware(app)
request = webob.Request.blank("/v1.0/flavors/1") request = webob.Request.blank("/v1.1/flavors/1")
request.environ['api.version'] = '1.1'
response = request.get_response(ext_midware) response = request.get_response(ext_midware)
self.assertEqual(200, response.status_int) self.assertEqual(200, response.status_int)
response_data = json.loads(response.body) response_data = json.loads(response.body)
print response_data
self.assertEqual(test_resp, response_data['flavor']['googoose']) self.assertEqual(test_resp, response_data['flavor']['googoose'])
self.assertEqual("Pig Bands!", response_data['big_bands']) self.assertEqual("Pig Bands!", response_data['big_bands'])