archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Added file upload support to AbstractPillarTest.client_request

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-07-08 11:23:06 +02:00
parent 8a7c7afc3c
commit a322aee0c7
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/common_test_class.py
View File

@ -218,14 +218,14 @@ class AbstractPillarTest(TestMinimal):
return group_ids return group_ids
def client_request(self, method, url, expected_status=200, auth_token=None, json=None, def client_request(self, method, path, expected_status=200, auth_token=None, json=None,
data=None): data=None, headers=None, files=None, content_type=None):
"""Performs a HTTP request to the server.""" """Performs a HTTP request to the server."""
from application.utils import dumps from application.utils import dumps
import json as mod_json import json as mod_json
headers = {} headers = headers or {}
if auth_token is not None: if auth_token is not None:
headers['Authorization'] = self.make_header(auth_token) headers['Authorization'] = self.make_header(auth_token)
@ -233,8 +233,17 @@ class AbstractPillarTest(TestMinimal):
data = dumps(json) data = dumps(json)
headers['Content-Type'] = 'application/json' headers['Content-Type'] = 'application/json'
resp = self.client.open(url, method=method, data=data, headers=headers) if files:
self.assertEqual(expected_status, resp.status_code, resp.data) data = data or {}
content_type = 'multipart/form-data'
data.update(files)
resp = self.client.open(path=path, method=method, data=data, headers=headers,
content_type=content_type)
self.assertEqual(expected_status, resp.status_code,
'Expected status %i but got %i. Response: %s' % (
expected_status, resp.status_code, resp.data
))
def json(): def json():
if resp.mimetype != 'application/json': if resp.mimetype != 'application/json':