28a253104a
log_handler is not used any more by Ceilometer project, but still listed on openstack-common.conf, this patch fixes it. Note: oslo-incubator.timeutils is not used by oslo-incubator modules any more after we do code sync, this patch removes it too. gettextutils has graduated from oslo-incubator, we should port our project to use oslo.i18n. To use oslo.i18n conveniently, this patch introduces a helper module ceilometer.i18n, which is stolen from Nova. Note: gettextutils.install is deprecated, see: http://docs.openstack.org/developer/oslo.i18n/usage.html#creating-an-integration-module Note: _ is removed from builtins in tox.ini since we're not using install any more. Change-Id: I829f9faf97c825422b395bf9c01ae5c17c86d9fb Closes-Bug: #1389546
178 lines
8.2 KiB
Python
178 lines
8.2 KiB
Python
#
|
|
# Copyright 2013 IBM Corp.
|
|
# Copyright 2013 Julien Danjou
|
|
#
|
|
# Author: Julien Danjou <julien@danjou.info>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
"""Test basic ceilometer-api app
|
|
"""
|
|
import json
|
|
|
|
import mock
|
|
import wsme
|
|
|
|
from ceilometer import i18n
|
|
from ceilometer.tests.api import v2
|
|
|
|
|
|
class TestPecanApp(v2.FunctionalTest):
|
|
|
|
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('application/json', response.content_type)
|
|
|
|
|
|
class TestApiMiddleware(v2.FunctionalTest):
|
|
|
|
no_lang_translated_error = 'No lang translated error'
|
|
en_US_translated_error = 'en-US translated error'
|
|
|
|
def _fake_translate(self, message, user_locale):
|
|
if user_locale is None:
|
|
return self.no_lang_translated_error
|
|
else:
|
|
return self.en_US_translated_error
|
|
|
|
def test_json_parsable_error_middleware_404(self):
|
|
response = self.get_json('/invalid_path',
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/json"}
|
|
)
|
|
self.assertEqual(404, response.status_int)
|
|
self.assertEqual("application/json", response.content_type)
|
|
self.assertTrue(response.json['error_message'])
|
|
response = self.get_json('/invalid_path',
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/json,application/xml"}
|
|
)
|
|
self.assertEqual(404, response.status_int)
|
|
self.assertEqual("application/json", response.content_type)
|
|
self.assertTrue(response.json['error_message'])
|
|
response = self.get_json('/invalid_path',
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/xml;q=0.8, \
|
|
application/json"}
|
|
)
|
|
self.assertEqual(404, response.status_int)
|
|
self.assertEqual("application/json", response.content_type)
|
|
self.assertTrue(response.json['error_message'])
|
|
response = self.get_json('/invalid_path',
|
|
expect_errors=True
|
|
)
|
|
self.assertEqual(404, response.status_int)
|
|
self.assertEqual("application/json", response.content_type)
|
|
self.assertTrue(response.json['error_message'])
|
|
response = self.get_json('/invalid_path',
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"text/html,*/*"}
|
|
)
|
|
self.assertEqual(404, response.status_int)
|
|
self.assertEqual("application/json", response.content_type)
|
|
self.assertTrue(response.json['error_message'])
|
|
|
|
def test_json_parsable_error_middleware_translation_400(self):
|
|
# Ensure translated messages get placed properly into json faults
|
|
with mock.patch.object(i18n, 'translate',
|
|
side_effect=self._fake_translate):
|
|
response = self.post_json('/alarms', params={'name': 'foobar',
|
|
'type': 'threshold'},
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/json"}
|
|
)
|
|
self.assertEqual(400, response.status_int)
|
|
self.assertEqual("application/json", response.content_type)
|
|
self.assertTrue(response.json['error_message'])
|
|
self.assertEqual(self.no_lang_translated_error,
|
|
response.json['error_message']['faultstring'])
|
|
|
|
def test_xml_parsable_error_middleware_404(self):
|
|
response = self.get_json('/invalid_path',
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/xml,*/*"}
|
|
)
|
|
self.assertEqual(404, response.status_int)
|
|
self.assertEqual("application/xml", response.content_type)
|
|
self.assertEqual('error_message', response.xml.tag)
|
|
response = self.get_json('/invalid_path',
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/json;q=0.8 \
|
|
,application/xml"}
|
|
)
|
|
self.assertEqual(404, response.status_int)
|
|
self.assertEqual("application/xml", response.content_type)
|
|
self.assertEqual('error_message', response.xml.tag)
|
|
|
|
def test_xml_parsable_error_middleware_translation_400(self):
|
|
# Ensure translated messages get placed properly into xml faults
|
|
with mock.patch.object(i18n, 'translate',
|
|
side_effect=self._fake_translate):
|
|
response = self.post_json('/alarms', params={'name': 'foobar',
|
|
'type': 'threshold'},
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/xml,*/*"}
|
|
)
|
|
self.assertEqual(400, response.status_int)
|
|
self.assertEqual("application/xml", response.content_type)
|
|
self.assertEqual('error_message', response.xml.tag)
|
|
fault = response.xml.findall('./error/faultstring')
|
|
for fault_string in fault:
|
|
self.assertEqual(self.no_lang_translated_error, fault_string.text)
|
|
|
|
def test_best_match_language(self):
|
|
# Ensure that we are actually invoking language negotiation
|
|
with mock.patch.object(i18n, 'translate',
|
|
side_effect=self._fake_translate):
|
|
response = self.post_json('/alarms', params={'name': 'foobar',
|
|
'type': 'threshold'},
|
|
expect_errors=True,
|
|
headers={"Accept":
|
|
"application/xml,*/*",
|
|
"Accept-Language":
|
|
"en-US"}
|
|
)
|
|
|
|
self.assertEqual(400, response.status_int)
|
|
self.assertEqual("application/xml", response.content_type)
|
|
self.assertEqual('error_message', response.xml.tag)
|
|
fault = response.xml.findall('./error/faultstring')
|
|
for fault_string in fault:
|
|
self.assertEqual(self.en_US_translated_error, fault_string.text)
|
|
|
|
def test_translated_then_untranslated_error(self):
|
|
resp = self.get_json('/alarms/alarm-id-3', expect_errors=True)
|
|
self.assertEqual(404, resp.status_code)
|
|
self.assertEqual("Alarm alarm-id-3 not found",
|
|
json.loads(resp.body)['error_message']
|
|
['faultstring'])
|
|
|
|
with mock.patch('ceilometer.api.controllers.'
|
|
'v2.AlarmNotFound') as CustomErrorClass:
|
|
CustomErrorClass.return_value = wsme.exc.ClientSideError(
|
|
"untranslated_error", status_code=404)
|
|
resp = self.get_json('/alarms/alarm-id-5', expect_errors=True)
|
|
|
|
self.assertEqual(404, resp.status_code)
|
|
self.assertEqual("untranslated_error",
|
|
json.loads(resp.body)['error_message']
|
|
['faultstring'])
|