Merge branch 'master' into split-sms-and-retry

This commit is contained in:
Martyn Inglis
2016-06-13 11:39:13 +01:00
24 changed files with 352 additions and 87 deletions

View File

@@ -536,7 +536,7 @@ def mock_firetext_client(mocker, statsd_client=None):
statsd_client = statsd_client or mocker.Mock()
current_app = mocker.Mock(config={
'FIRETEXT_API_KEY': 'foo',
'FIRETEXT_NUMBER': 'bar'
'FROM_NUMBER': 'bar'
})
client.init_app(current_app, statsd_client)
return client
@@ -548,7 +548,7 @@ def mock_mmg_client(mocker, statsd_client=None):
statsd_client = statsd_client or mocker.Mock()()
current_app = mocker.Mock(config={
'MMG_API_KEY': 'foo',
'MMG_FROM_NUMBER': 'bar'
'FROM_NUMBER': 'bar'
})
client.init_app(current_app, statsd_client)
return client