sms: make error messages indifferent in py2/py3 (#38781)

This commit is contained in:
Emmanuel Cazenave 2020-01-23 15:15:47 +01:00
parent b4fb17bc50
commit b58c993000
5 changed files with 12 additions and 15 deletions

View File

@ -29,10 +29,8 @@ class ChoositSMSGateway(BaseResource, SMSGatewayMixin):
'err': 1,
'err_desc': 'Choosit error: some destinations failed',
'data': [
[u'0033688888888', u'Choosit error: bad JSON response No JSON object '
'could be decoded'],
[u'0033677777777', u'Choosit error: bad JSON response No JSON object '
'could be decoded'],
[u'0033688888888', u'Choosit error: bad JSON response'],
[u'0033677777777', u'Choosit error: bad JSON response'],
]
}
},
@ -98,7 +96,7 @@ class ChoositSMSGateway(BaseResource, SMSGatewayMixin):
try:
output = r.json()
except ValueError as e:
results.append('Choosit error: bad JSON response %s' % e)
results.append('Choosit error: bad JSON response')
else:
if not isinstance(output, dict):
results.append('Choosit error: JSON response is not a dict %r' % output)

View File

@ -37,7 +37,7 @@ class MobytSMSGateway(BaseResource, SMSGatewayMixin):
'response': '',
'result': {
'err': 1,
'err_desc': 'MobyT error: received \'\' instead of OK',
'err_desc': 'MobyT error: response is not "OK"',
}
}
@ -69,5 +69,5 @@ class MobytSMSGateway(BaseResource, SMSGatewayMixin):
except requests.RequestException as e:
raise APIError('MobyT error: POST failed, %s' % e)
if r.content[:2] != "OK":
raise APIError('MobyT error: received %r instead of OK' % r.content)
raise APIError('MobyT error: response is not "OK"')
return None

View File

@ -49,8 +49,7 @@ class OVHSMSGateway(BaseResource, SMSGatewayMixin):
'response': '',
'result': {
'err': 1,
'err_desc': 'OVH error: bad JSON response, \'\', '
'No JSON object could be decoded',
'err_desc': 'OVH error: bad JSON response',
}
},
{
@ -110,7 +109,7 @@ class OVHSMSGateway(BaseResource, SMSGatewayMixin):
try:
result = response.json()
except ValueError as e:
raise APIError('OVH error: bad JSON response, %r, %s' % (response.content, e))
raise APIError('OVH error: bad JSON response')
else:
if not isinstance(result, dict):
raise APIError('OVH error: bad JSON response %r, it should be a dictionnary' %

View File

@ -31,8 +31,8 @@ class OxydSMSGateway(BaseResource, SMSGatewayMixin):
'err': 1,
'err_desc': 'OXYD error: some destinations failed',
'data': [
['0033688888888', "OXYD error: received content '' instead of 200"],
['0033677777777', "OXYD error: received content '' instead of 200"],
['0033688888888', "OXYD error: response is not 200"],
['0033677777777', "OXYD error: response is not 200"],
],
}
},
@ -73,7 +73,7 @@ class OxydSMSGateway(BaseResource, SMSGatewayMixin):
else:
code = r.content and r.content.split()[0]
if code != '200':
results.append('OXYD error: received content %r instead of 200' % r.content)
results.append('OXYD error: response is not 200')
else:
results.append(0)
if any(results):

View File

@ -220,8 +220,8 @@ def test_logged_requests_and_responses_max_size(app, oxyd, settings):
# connector POST queries
assert len(ResourceLog.objects.all()[1].extra['request_payload']) == 57
assert len(ResourceLog.objects.all()[2].extra['request_payload']) == 57
assert len(ResourceLog.objects.all()[1].extra['response_content']) in (244, 245)
assert len(ResourceLog.objects.all()[2].extra['response_content']) in (244, 245)
assert len(ResourceLog.objects.all()[1].extra['response_content']) in (210, 211)
assert len(ResourceLog.objects.all()[2].extra['response_content']) in (210, 211)
# connector reply
assert len(ResourceLog.objects.all()[3].extra['body']) in (86, 87)