diff options
Diffstat (limited to 'tests/test_http.py')
| -rw-r--r-- | tests/test_http.py | 389 |
1 files changed, 95 insertions, 294 deletions
diff --git a/tests/test_http.py b/tests/test_http.py index 8dabdba..0c8a4ac 100644 --- a/tests/test_http.py +++ b/tests/test_http.py @@ -12,21 +12,18 @@ # 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 json -import errno -import socket - -import mock from mox3 import mox +import requests import six -from six.moves import http_client from six.moves.urllib import parse -import tempfile import testtools +import types import glanceclient from glanceclient.common import http -from glanceclient.common import utils as client_utils +from glanceclient.common import https from glanceclient import exc from tests import utils @@ -36,8 +33,7 @@ class TestClient(testtools.TestCase): def setUp(self): super(TestClient, self).setUp() self.mock = mox.Mox() - self.mock.StubOutWithMock(http_client.HTTPConnection, 'request') - self.mock.StubOutWithMock(http_client.HTTPConnection, 'getresponse') + self.mock.StubOutWithMock(requests.Session, 'request') self.endpoint = 'http://example.com:9292' self.client = http.HTTPClient(self.endpoint, token=u'abc123') @@ -85,14 +81,16 @@ class TestClient(testtools.TestCase): And the error should list the host and port that refused the connection """ - http_client.HTTPConnection.request( + requests.Session.request( mox.IgnoreArg(), mox.IgnoreArg(), + data=mox.IgnoreArg(), headers=mox.IgnoreArg(), - ).AndRaise(socket.error()) + stream=mox.IgnoreArg(), + ).AndRaise(requests.exceptions.ConnectionError()) self.mock.ReplayAll() try: - self.client.json_request('GET', '/v1/images/detail?limit=20') + self.client.get('/v1/images/detail?limit=20') #NOTE(alaski) We expect exc.CommunicationError to be raised # so we should never reach this point. try/except is used here # rather than assertRaises() so that we can check the body of @@ -103,47 +101,23 @@ class TestClient(testtools.TestCase): (comm_err.message, self.endpoint)) self.assertTrue(self.endpoint in comm_err.message, fail_msg) - def test_request_redirected(self): - resp = utils.FakeResponse({'location': 'http://www.example.com'}, - status=302, body=six.BytesIO()) - http_client.HTTPConnection.request( - mox.IgnoreArg(), - mox.IgnoreArg(), - headers=mox.IgnoreArg(), - ) - http_client.HTTPConnection.getresponse().AndReturn(resp) - - # The second request should be to the redirected location - expected_response = b'Ok' - resp2 = utils.FakeResponse({}, six.BytesIO(expected_response)) - http_client.HTTPConnection.request( - 'GET', - 'http://www.example.com', - headers=mox.IgnoreArg(), - ) - http_client.HTTPConnection.getresponse().AndReturn(resp2) - - self.mock.ReplayAll() - - self.client.json_request('GET', '/v1/images/detail') - def test_http_encoding(self): - http_client.HTTPConnection.request( + # Lets fake the response + # returned by requests + response = 'Ok' + headers = {"Content-Type": "text/plain"} + fake = utils.FakeResponse(headers, six.StringIO(response)) + requests.Session.request( mox.IgnoreArg(), mox.IgnoreArg(), - headers=mox.IgnoreArg()) - - # Lets fake the response - # returned by httplib - expected_response = b'Ok' - fake = utils.FakeResponse({}, six.BytesIO(expected_response)) - http_client.HTTPConnection.getresponse().AndReturn(fake) + data=mox.IgnoreArg(), + stream=mox.IgnoreArg(), + headers=mox.IgnoreArg()).AndReturn(fake) self.mock.ReplayAll() headers = {"test": u'ni\xf1o'} - resp, body = self.client.raw_request('GET', '/v1/images/detail', - headers=headers) - self.assertEqual(fake, resp) + resp, body = self.client.get('/v1/images/detail', headers=headers) + self.assertEqual(resp, fake) def test_headers_encoding(self): value = u'ni\xf1o' @@ -156,153 +130,19 @@ class TestClient(testtools.TestCase): def test_raw_request(self): " Verify the path being used for HTTP requests reflects accurately. " - - def check_request(method, path, **kwargs): - self.assertEqual('GET', method) - # NOTE(kmcdonald): See bug #1179984 for more details. - self.assertEqual('/v1/images/detail', path) - - http_client.HTTPConnection.request( + headers = {"Content-Type": "text/plain"} + response = 'Ok' + fake = utils.FakeResponse({}, six.StringIO(response)) + requests.Session.request( mox.IgnoreArg(), mox.IgnoreArg(), - headers=mox.IgnoreArg()).WithSideEffects(check_request) - - # fake the response returned by httplib - fake = utils.FakeResponse({}, six.BytesIO(b'Ok')) - http_client.HTTPConnection.getresponse().AndReturn(fake) + data=mox.IgnoreArg(), + stream=mox.IgnoreArg(), + headers=mox.IgnoreArg()).AndReturn(fake) self.mock.ReplayAll() - resp, body = self.client.raw_request('GET', '/v1/images/detail') - self.assertEqual(fake, resp) - - def test_customized_path_raw_request(self): - """ - Verify the customized path being used for HTTP requests - reflects accurately - """ - - def check_request(method, path, **kwargs): - self.assertEqual('GET', method) - self.assertEqual('/customized-path/v1/images/detail', path) - - # NOTE(yuyangbj): see bug 1230032 to get more info - endpoint = 'http://example.com:9292/customized-path' - client = http.HTTPClient(endpoint, token=u'abc123') - self.assertEqual('/customized-path', client.endpoint_path) - - http_client.HTTPConnection.request( - mox.IgnoreArg(), - mox.IgnoreArg(), - headers=mox.IgnoreArg()).WithSideEffects(check_request) - - # fake the response returned by httplib - fake = utils.FakeResponse({}, six.BytesIO(b'Ok')) - http_client.HTTPConnection.getresponse().AndReturn(fake) - self.mock.ReplayAll() - - resp, body = client.raw_request('GET', '/v1/images/detail') - self.assertEqual(fake, resp) - - def test_raw_request_no_content_length(self): - with tempfile.NamedTemporaryFile() as test_file: - test_file.write(b'abcd') - test_file.seek(0) - data_length = 4 - self.assertEqual(data_length, - client_utils.get_file_size(test_file)) - - exp_resp = {'body': test_file} - exp_resp['headers'] = {'Content-Length': str(data_length), - 'Content-Type': 'application/octet-stream'} - - def mock_request(url, method, **kwargs): - return kwargs - - rq_kwargs = {'body': test_file, 'content_length': None} - - with mock.patch.object(self.client, '_http_request') as mock_rq: - mock_rq.side_effect = mock_request - resp = self.client.raw_request('PUT', '/v1/images/detail', - **rq_kwargs) - - rq_kwargs.pop('content_length') - headers = {'Content-Length': str(data_length), - 'Content-Type': 'application/octet-stream'} - rq_kwargs['headers'] = headers - - mock_rq.assert_called_once_with('/v1/images/detail', 'PUT', - **rq_kwargs) - - self.assertEqual(exp_resp, resp) - - def test_raw_request_w_content_length(self): - with tempfile.NamedTemporaryFile() as test_file: - test_file.write(b'abcd') - test_file.seek(0) - data_length = 4 - self.assertEqual(data_length, - client_utils.get_file_size(test_file)) - - exp_resp = {'body': test_file} - # NOTE: we expect the actual file size to be overridden by the - # supplied content length. - exp_resp['headers'] = {'Content-Length': '4', - 'Content-Type': 'application/octet-stream'} - - def mock_request(url, method, **kwargs): - return kwargs - - rq_kwargs = {'body': test_file, 'content_length': data_length} - - with mock.patch.object(self.client, '_http_request') as mock_rq: - mock_rq.side_effect = mock_request - resp = self.client.raw_request('PUT', '/v1/images/detail', - **rq_kwargs) - - rq_kwargs.pop('content_length') - headers = {'Content-Length': str(data_length), - 'Content-Type': 'application/octet-stream'} - rq_kwargs['headers'] = headers - - mock_rq.assert_called_once_with('/v1/images/detail', 'PUT', - **rq_kwargs) - - self.assertEqual(exp_resp, resp) - - def test_raw_request_w_bad_content_length(self): - with tempfile.NamedTemporaryFile() as test_file: - test_file.write(b'abcd') - test_file.seek(0) - self.assertEqual(4, client_utils.get_file_size(test_file)) - - def mock_request(url, method, **kwargs): - return kwargs - - with mock.patch.object(self.client, '_http_request', mock_request): - self.assertRaises(AttributeError, self.client.raw_request, - 'PUT', '/v1/images/detail', body=test_file, - content_length=32) - - def test_connection_refused_raw_request(self): - """ - Should receive a CommunicationError if connection refused. - And the error should list the host and port that refused the - connection - """ - endpoint = 'http://example.com:9292' - client = http.HTTPClient(endpoint, token=u'abc123') - http_client.HTTPConnection.request(mox.IgnoreArg(), mox.IgnoreArg(), - headers=mox.IgnoreArg() - ).AndRaise(socket.error()) - self.mock.ReplayAll() - try: - client.raw_request('GET', '/v1/images/detail?limit=20') - - self.fail('An exception should have bypassed this line.') - except exc.CommunicationError as comm_err: - fail_msg = ("Exception message '%s' should contain '%s'" % - (comm_err.message, endpoint)) - self.assertTrue(endpoint in comm_err.message, fail_msg) + resp, body = self.client.get('/v1/images/detail', headers=headers) + self.assertEqual(resp, fake) def test_parse_endpoint(self): endpoint = 'http://example.com:9292' @@ -313,81 +153,84 @@ class TestClient(testtools.TestCase): query='', fragment='') self.assertEqual(expected, actual) - def test_get_connection_class(self): - endpoint = 'http://example.com:9292' - test_client = http.HTTPClient(endpoint, token=u'adc123') - actual = (test_client.get_connection_class('https')) - self.assertEqual(http.VerifiedHTTPSConnection, actual) - def test_get_connections_kwargs_http(self): endpoint = 'http://example.com:9292' test_client = http.HTTPClient(endpoint, token=u'adc123') - actual = test_client.get_connection_kwargs('http', insecure=True) - self.assertEqual({'timeout': 600.0}, actual) - - def test_get_connections_kwargs_https(self): - endpoint = 'http://example.com:9292' - test_client = http.HTTPClient(endpoint, token=u'adc123') - actual = test_client.get_connection_kwargs('https', insecure=True) - expected = {'cacert': None, - 'cert_file': None, - 'insecure': True, - 'key_file': None, - 'ssl_compression': True, - 'timeout': 600.0} - self.assertEqual(expected, actual) - - def test_log_curl_request_with_non_ascii_char(self): - try: - headers = {'header1': 'value1\xa5\xa6'} - http_client_object = http.HTTPClient(self.endpoint) - http_client_object.log_curl_request('GET', - 'http://www.example.com/\xa5', - {'headers': headers}) - except UnicodeDecodeError as e: - self.fail("Unexpected UnicodeDecodeError exception '%s'" % e) + self.assertEqual(test_client.timeout, 600.0) + def test_http_chunked_request(self): + # Lets fake the response + # returned by requests + response = "Ok" + data = six.StringIO(response) + fake = utils.FakeResponse({}, data) + requests.Session.request( + mox.IgnoreArg(), + mox.IgnoreArg(), + stream=mox.IgnoreArg(), + data=mox.IsA(types.GeneratorType), + headers=mox.IgnoreArg()).AndReturn(fake) + self.mock.ReplayAll() -class TestHostResolutionError(testtools.TestCase): + headers = {"test": u'chunked_request'} + resp, body = self.client.post('/v1/images/', + headers=headers, data=data) + self.assertEqual(resp, fake) - def setUp(self): - super(TestHostResolutionError, self).setUp() - self.mock = mox.Mox() - self.invalid_host = "example.com.incorrect_top_level_domain" + def test_http_json(self): + data = {"test": "json_request"} + fake = utils.FakeResponse({}, "OK") - def test_incorrect_domain_error(self): - """ - Make sure that using a domain which does not resolve causes an - exception which mentions that specific hostname as a reason for - failure. - """ - class FailingConnectionClass(object): - def __init__(self, *args, **kwargs): - pass + def test_json(passed_data): + """ + This function tests whether the data + being passed to request's method is + a valid json or not. - def putrequest(self, *args, **kwargs): - raise socket.gaierror(-2, "Name or service not known") + This function will be called by pymox - def request(self, *args, **kwargs): - raise socket.gaierror(-2, "Name or service not known") + :params passed_data: The data being + passed to requests.Session.request. + """ + if not isinstance(passed_data, six.string_types): + return False - self.endpoint = 'http://%s:9292' % (self.invalid_host,) - self.client = http.HTTPClient(self.endpoint, token=u'abc123') + try: + passed_data = json.loads(passed_data) + return data == passed_data + except (TypeError, ValueError): + return False - self.mock.StubOutWithMock(self.client, 'get_connection') - self.client.get_connection().AndReturn(FailingConnectionClass()) + requests.Session.request( + mox.IgnoreArg(), + mox.IgnoreArg(), + stream=mox.IgnoreArg(), + data=mox.Func(test_json), + headers=mox.IgnoreArg()).AndReturn(fake) self.mock.ReplayAll() - try: - self.client.raw_request('GET', '/example/path') - self.fail("gaierror should be raised") - except exc.InvalidEndpoint as e: - self.assertTrue(self.invalid_host in str(e), - "exception should contain the hostname") + headers = {"test": u'chunked_request'} + resp, body = self.client.post('/v1/images/', + headers=headers, + data=data) + self.assertEqual(resp, fake) - def tearDown(self): - super(TestHostResolutionError, self).tearDown() - self.mock.UnsetStubs() + def test_http_chunked_response(self): + headers = {"Content-Type": "application/octet-stream"} + data = "TEST" + fake = utils.FakeResponse(headers, six.StringIO(data)) + + requests.Session.request( + mox.IgnoreArg(), + mox.IgnoreArg(), + stream=mox.IgnoreArg(), + data=mox.IgnoreArg(), + headers=mox.IgnoreArg()).AndReturn(fake) + self.mock.ReplayAll() + headers = {"test": u'chunked_request'} + resp, body = self.client.get('/v1/images/') + self.assertTrue(isinstance(body, types.GeneratorType)) + self.assertEqual([data], list(body)) class TestVerifiedHTTPSConnection(testtools.TestCase): @@ -396,7 +239,7 @@ class TestVerifiedHTTPSConnection(testtools.TestCase): def test_setcontext_unable_to_load_cacert(self): """Add this UT case with Bug#1265730.""" self.assertRaises(exc.SSLConfigurationError, - http.VerifiedHTTPSConnection, + https.VerifiedHTTPSConnection, "127.0.0.1", None, None, @@ -405,45 +248,3 @@ class TestVerifiedHTTPSConnection(testtools.TestCase): None, False, True) - - -class TestResponseBodyIterator(testtools.TestCase): - - def test_iter_default_chunk_size_64k(self): - resp = utils.FakeResponse({}, six.BytesIO(b'X' * 98304)) - iterator = http.ResponseBodyIterator(resp) - chunks = list(iterator) - self.assertEqual([b'X' * 65536, b'X' * 32768], chunks) - - def test_integrity_check_with_correct_checksum(self): - resp = utils.FakeResponse({}, six.BytesIO(b'CCC')) - body = http.ResponseBodyIterator(resp) - body.set_checksum('defb99e69a9f1f6e06f15006b1f166ae') - list(body) - - def test_integrity_check_with_wrong_checksum(self): - resp = utils.FakeResponse({}, six.BytesIO(b'BB')) - body = http.ResponseBodyIterator(resp) - body.set_checksum('wrong') - try: - list(body) - self.fail('integrity checked passed with wrong checksum') - except IOError as e: - self.assertEqual(errno.EPIPE, e.errno) - - def test_set_checksum_in_consumed_iterator(self): - resp = utils.FakeResponse({}, six.BytesIO(b'CCC')) - body = http.ResponseBodyIterator(resp) - list(body) - # Setting checksum for an already consumed iterator should raise an - # AttributeError. - self.assertRaises( - AttributeError, body.set_checksum, - 'defb99e69a9f1f6e06f15006b1f166ae') - - def test_body_size(self): - size = 1000000007 - resp = utils.FakeResponse( - {'content-length': str(size)}, six.BytesIO(b'BB')) - body = http.ResponseBodyIterator(resp) - self.assertEqual(size, len(body)) |