From 65b492fee3f5a9a45a3760162730229892e0bb18 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 11 Mar 2016 16:47:34 +0100 Subject: [PATCH] tests: move HTTMock templates to utils --- tests/test_utils.py | 12 +++--------- tests/utils.py | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 tests/utils.py diff --git a/tests/test_utils.py b/tests/test_utils.py index bec3c62..80f3d40 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -3,17 +3,14 @@ import datetime import mock import lasso -from httmock import all_requests, response, HTTMock import requests.exceptions +from httmock import HTTMock from mellon.utils import create_server, create_metadata, iso8601_to_datetime, flatten_datetime import mellon.utils from xml_utils import assert_xml_constraints - -@all_requests -def error_500(url, request): - return response(500, reason='Internal Server Error', request=request) +from utils import error_500, metadata_response def test_create_server_connection_error(mocker, rf, private_settings, caplog): @@ -116,12 +113,9 @@ def test_create_server_good_metadata_url(mocker, rf, private_settings, caplog): } ] - @all_requests - def metadata(url, request): - return response(200, content=file('tests/metadata.xml').read()) request = rf.get('/') assert not 'failed with error' in caplog.text() - with HTTMock(metadata): + with HTTMock(metadata_response): server = create_server(request) assert 'ERROR' not in caplog.text() assert len(server.providers) == 1 diff --git a/tests/utils.py b/tests/utils.py new file mode 100644 index 0000000..1eace51 --- /dev/null +++ b/tests/utils.py @@ -0,0 +1,16 @@ +from httmock import all_requests, response + + +@all_requests +def error_500(url, request): + return response(500, reason='Internal Server Error', request=request) + + +@all_requests +def html_response(url, request): + return response(200, '', headers={'content-type': 'text/html'}, request=request) + + +@all_requests +def metadata_response(url, request): + return response(200, content=file('tests/metadata.xml').read())