
WebOb change https://github.com/Pylons/webob/pull/230 changed the way in which the error response body is formatted such that it's no longer a nested dict. So we have to handle both the old convention of an error message key to the response body error dict and the new way with just the error body dict. This was reported upstream: https://github.com/Pylons/webob/issues/235 But given this was apparently implemented as a long-overdue change in WebOb the behavior is not likely to change. Change-Id: Id8bfde6277640de48768bbe5a5e4252b97253ed2 Closes-Bug: #1559072 Co-Authored-By: Matt Riedemann <mriedem@us.ibm.com> Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>
102 lines
3.4 KiB
Python
102 lines
3.4 KiB
Python
# Copyright [2015] Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# 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.
|
|
|
|
import os
|
|
|
|
import fixtures
|
|
import mock
|
|
import requests
|
|
import testtools
|
|
|
|
AUTH_URL = "http://localhost:5002/auth_url"
|
|
AUTH_URL_V1 = "http://localhost:5002/auth_url/v1.0"
|
|
AUTH_URL_V2 = "http://localhost:5002/auth_url/v2.0"
|
|
|
|
URL_QUERY_SEPARATOR = '&'
|
|
URL_SEPARATOR = '?'
|
|
|
|
|
|
def order_url(url):
|
|
"""Returns the url with the query strings ordered, if they exist and
|
|
there's more than one. Otherwise the url is returned unaltered.
|
|
"""
|
|
if URL_QUERY_SEPARATOR in url:
|
|
parts = url.split(URL_SEPARATOR)
|
|
if len(parts) == 2:
|
|
queries = sorted(parts[1].split(URL_QUERY_SEPARATOR))
|
|
url = URL_SEPARATOR.join(
|
|
[parts[0], URL_QUERY_SEPARATOR.join(queries)])
|
|
return url
|
|
|
|
|
|
def _patch_mock_to_raise_for_invalid_assert_calls():
|
|
def raise_for_invalid_assert_calls(wrapped):
|
|
def wrapper(_self, name):
|
|
valid_asserts = [
|
|
'assert_called_with',
|
|
'assert_called_once_with',
|
|
'assert_has_calls',
|
|
'assert_any_calls']
|
|
|
|
if name.startswith('assert') and name not in valid_asserts:
|
|
raise AttributeError('%s is not a valid mock assert method'
|
|
% name)
|
|
|
|
return wrapped(_self, name)
|
|
return wrapper
|
|
mock.Mock.__getattr__ = raise_for_invalid_assert_calls(
|
|
mock.Mock.__getattr__)
|
|
|
|
# NOTE(gibi): needs to be called only once at import time
|
|
# to patch the mock lib
|
|
_patch_mock_to_raise_for_invalid_assert_calls()
|
|
|
|
|
|
class TestCase(testtools.TestCase):
|
|
TEST_REQUEST_BASE = {
|
|
'verify': True,
|
|
}
|
|
|
|
def setUp(self):
|
|
super(TestCase, self).setUp()
|
|
if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or
|
|
os.environ.get('OS_STDOUT_CAPTURE') == '1'):
|
|
stdout = self.useFixture(fixtures.StringStream('stdout')).stream
|
|
self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout))
|
|
if (os.environ.get('OS_STDERR_CAPTURE') == 'True' or
|
|
os.environ.get('OS_STDERR_CAPTURE') == '1'):
|
|
stderr = self.useFixture(fixtures.StringStream('stderr')).stream
|
|
self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr))
|
|
|
|
|
|
class TestResponse(requests.Response):
|
|
"""Class used to wrap requests.Response and provide some
|
|
convenience to initialize with a dict
|
|
"""
|
|
|
|
def __init__(self, data):
|
|
super(TestResponse, self).__init__()
|
|
self._text = None
|
|
if isinstance(data, dict):
|
|
self.status_code = data.get('status_code')
|
|
self.headers = data.get('headers')
|
|
# Fake the text attribute to streamline Response creation
|
|
self._text = data.get('text')
|
|
else:
|
|
self.status_code = data
|
|
|
|
@property
|
|
def text(self):
|
|
return self._text
|