darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-21 07:51:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor conftest

Browse Source
This commit is contained in:
Ken Tsang
2017-08-04 21:27:09 +01:00
parent 6908ec4821
commit 468048797a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/app/conftest.py
View File

@@ -1051,8 +1051,16 @@ def admin_request(client):
data=json.dumps(_data), data=json.dumps(_data),
headers=[('Content-Type', 'application/json'), create_authorization_header()] headers=[('Content-Type', 'application/json'), create_authorization_header()]
) )
<<<<<<< HEAD
json_resp = json.loads(resp.get_data(as_text=True)) json_resp = json.loads(resp.get_data(as_text=True))
assert resp.status_code == _expected_status, json_resp assert resp.status_code == _expected_status, json_resp
=======
if resp.get_data:
json_resp = json.loads(resp.get_data(as_text=True))
else:
json_resp = None
assert resp.status_code == _expected_status
>>>>>>> Refactor conftest
return json_resp return json_resp
@staticmethod @staticmethod