entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

python3: replace json parser input with str (#40012)

This commit is contained in:
Nicolas Roche 2020-02-20 20:39:09 +01:00
parent d5cbe123df
commit 212b9ab736
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_health_api.py
View File

@ -31,7 +31,7 @@ def test_response(app, admin_user, services, monkeypatch):
monkeypatch.setattr(requests, 'get', lambda x, *args, **kwargs: MagicMock(status_code=200))
response = app.get('/api/health/')
assert response.status_code == 200
content = json.loads(response.content)
content = json.loads(response.text)
assert 'blues' in content['data'].keys()
assert 'jazz' in content['data'].keys()
@ -46,7 +46,7 @@ def test_is_resolvable(app, admin_user, services, monkeypatch):
monkeypatch.setattr(socket, 'gethostbyname', gethostname)
monkeypatch.setattr(requests, 'get', lambda x, *args, **kwargs: MagicMock(status_code=200))
response = app.get('/api/health/')
content = json.loads(response.content)
content = json.loads(response.text)
blues = content['data']['blues']
jazz = content['data']['jazz']
assert not blues['is_resolvable']
@ -69,7 +69,7 @@ def test_is_running(app, admin_user, services, monkeypatch):
with HTTMock(blues_mock, jazz_mock) as mock:
response = app.get('/api/health/')
content = json.loads(response.content)
content = json.loads(response.text)
blues = content['data']['blues']
jazz = content['data']['jazz']
assert not blues['is_running']
@ -79,7 +79,7 @@ def test_is_running(app, admin_user, services, monkeypatch):
# check it gets results from cache
response = app.get('/api/health/')
content = json.loads(response.content)
content = json.loads(response.text)
blues = content['data']['blues']
jazz = content['data']['jazz']
assert not blues['is_running']
@ -93,7 +93,7 @@ def test_is_operational(app, admin_user, services, monkeypatch):
monkeypatch.setattr(socket, 'gethostbyname', lambda x: '176.31.123.109')
monkeypatch.setattr(requests, 'get', lambda x, *args, **kwargs: MagicMock(status_code=200))
response = app.get('/api/health/')
content = json.loads(response.content)
content = json.loads(response.text)
blues = content['data']['blues']
jazz = content['data']['jazz']
assert blues['is_operational']
@ -110,7 +110,7 @@ def test_has_valid_certificate(app, admin_user, services, monkeypatch):
monkeypatch.setattr(socket, 'gethostbyname', lambda x: '176.31.123.109')
monkeypatch.setattr(requests, 'get', get)
response = app.get('/api/health/')
content = json.loads(response.content)
content = json.loads(response.text)
blues = content['data']['blues']
jazz = content['data']['jazz']
assert blues['has_valid_certificate']

2
tests/test_version.py
View File

@ -14,5 +14,5 @@ def test_version_middleware(settings, client):
settings.MIDDLEWARE_CLASSES = (
'hobo.middleware.version.VersionMiddleware',
) + settings.MIDDLEWARE_CLASSES
json_response = json.loads(client.get('/__version__').content)
json_response = client.get('/__version__').json()
assert set(json_response.keys()) == set(['pytest', 'pytest-django'])