entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

newsletters: fix logging in case of connection error (#23825)

This commit is contained in:
Frédéric Péters 2018-07-01 12:21:48 +02:00
parent 70c5da0d23
commit bfc98e907a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
combo/apps/newsletters/models.py
View File

@ -120,8 +120,8 @@ class NewslettersCell(CellBase):
if 'uuid' not in kwargs:
raise SubscriptionsSaveError
headers = {'Content-type': 'application/json', 'Accept': 'application/json'}
endpoint = self.url + 'subscriptions/'
try:
endpoint = self.url + 'subscriptions/'
response = requests.post(endpoint, remote_service='auto', data=json.dumps(subscriptions),
user=user, federation_key='email', params=kwargs, headers=headers)
if not response.json()['data']:
@ -132,7 +132,7 @@ class NewslettersCell(CellBase):
raise SubscriptionsSaveError
except RequestException, e:
logger.error(u'set subscriptions on %s failed with exception: %s',
url, e)
endpoint, e)
raise SubscriptionsSaveError
def render(self, context):

4
tests/test_newsletters_cell.py
View File

@ -170,7 +170,7 @@ def test_get_subscriptions_signature_check(mock_get, cell, user):
def mocked_requests_connection_error(*args, **kwargs):
raise requests.ConnectionError()
@mock.patch('combo.apps.newsletters.models.requests.get',
@mock.patch('combo.apps.newsletters.models.requests.post',
side_effect=mocked_requests_connection_error)
def test_failed_set_subscriptions(mock_post, cell, user):
restrictions = ('sms', 'mail')
@ -180,7 +180,7 @@ def test_failed_set_subscriptions(mock_post, cell, user):
{'id': '8', 'transports': [{'id': 'sms', 'text': 'sms'},
{'id': 'mail', 'text': 'mail'}]}]
with pytest.raises(SubscriptionsSaveError):
cell.set_subscriptions(subscriptions, user)
cell.set_subscriptions(subscriptions, user, uuid='useruuid')
@mock.patch('combo.apps.newsletters.models.requests.post')
def test_set_subscriptions_with_no_uuid(mocked_post, cell, user):