openstack/aodh
Code Issues Proposed changes

Merge "Pecan assuming meter names are extensions"

Browse Source
This commit is contained in:
Jenkins 2013-09-13 02:32:44 +00:00 committed by Gerrit Code Review
commit 90a556ef33
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ceilometer/api/app.py
View File

@ -77,6 +77,7 @@ def setup_app(pecan_config=None, extra_hooks=None):
force_canonical=getattr(pecan_config.app, 'force_canonical', True), force_canonical=getattr(pecan_config.app, 'force_canonical', True),
hooks=app_hooks, hooks=app_hooks,
wrap_app=middleware.ParsableErrorMiddleware, wrap_app=middleware.ParsableErrorMiddleware,
guess_content_type_from_ext=False
) )
if pecan_config.app.enable_acl: if pecan_config.app.enable_acl:

9
tests/api/v2/test_app.py
View File

@ -65,6 +65,15 @@ class TestApp(base.TestCase):
os.unlink(tmpfile) os.unlink(tmpfile)
class TestPecanApp(FunctionalTest):
database_connection = tests_db.MongoDBFakeConnectionUrl()
def test_pecan_extension_guessing_unset(self):
# check Pecan does not assume .jpg is an extension
response = self.app.get(self.PATH_PREFIX + '/meters/meter.jpg')
self.assertEqual(response.content_type, 'application/json')
class TestApiMiddleware(FunctionalTest): class TestApiMiddleware(FunctionalTest):
# This doesn't really matter # This doesn't really matter