entrouvert
/
passerelle
15
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

solis: remove 'unknown' in 'unknown error' messages (#21476)

This commit is contained in:
Thomas NOËL 2018-02-01 12:04:44 +01:00
parent 91c63eea76
commit 75a149a7c2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
passerelle/apps/solis/models.py
View File

@ -82,7 +82,7 @@ class Solis(BaseResource):
def ping(self, request):
pong = self.request('main/isAlive')
if pong.status_code != 200:
raise APIError('unknown error status:%s, content:%r' %
raise APIError('error status:%s, content:%r' %
(pong.status_code, pong.content))
try:
response = pong.json().get('response') or ''
@ -100,7 +100,7 @@ class Solis(BaseResource):
if response.status_code == 403:
raise APIError('invalid credentials')
elif response.status_code != 200:
raise APIError('unknown error status:%s, content:%r' %
raise APIError('error status:%s, content:%r' %
(response.status_code, response.content))
return response.json().get('token')
@ -110,7 +110,7 @@ class Solis(BaseResource):
endpoint = 'asg/apa/' + endpoint + '/' + token
response = self.request(endpoint)
if response.status_code != 200:
raise APIError('unknown error status:%s, content:%r' %
raise APIError('error status:%s, content:%r' %
(response.status_code, response.content))
return response.json()

2
tests/test_solis.py
View File

@ -262,7 +262,7 @@ def test_solis_link_infos_unlink(app, solis):
assert requests_get.call_count == 2 # get informations
assert resp.json['err'] == 1
assert not resp.json['data']
assert resp.json['err_desc'].startswith('unknown error status:500')
assert resp.json['err_desc'].startswith('error status:500')
# unknown name_id or user_id
for qs in ('name_id=%s&user_id=XXX' % NAMEID, 'name_id=unlinked&user_id=53'):