tests: update for pytest 3.3 with merged catchlog (#20318)

This commit is contained in:
Thomas NOËL 2017-11-28 11:27:56 +01:00
parent f11e4bd30a
commit 894153074a
2 changed files with 3 additions and 5 deletions

View File

@ -165,8 +165,7 @@ def test_send_sms_with_no_gateway_defined(app, categories, announces, caplog):
broadcast = Broadcast.objects.get(announce=announce)
broadcast.send()
assert broadcast.delivery_count == 0
records = caplog.records()
for record in records:
for record in caplog.records:
assert record.name == 'corbo.utils'
assert record.levelno == logging.ERROR
assert record.getMessage() == 'SMS send requested but no SMS gateway defined.'
@ -187,7 +186,7 @@ def test_send_sms_with_gateway_api_error(mocked_post, app, categories, announces
mocked_post.return_value = mocked_response
broadcast.send()
assert broadcast.delivery_count == 0
records = caplog.records()
records = caplog.records
assert len(records) == 1 + i
for record in records:
assert record.name == 'corbo.utils'
@ -211,7 +210,7 @@ def test_send_sms_with_gateway_connection_error(mocked_post, app, categories, an
mocked_post.return_value = mocked_response
broadcast.send()
assert broadcast.delivery_count == 0
records = caplog.records()
records = caplog.records
assert len(records) == 1 + i
for record in records:
assert record.name == 'corbo.utils'

View File

@ -14,7 +14,6 @@ deps =
pytest-cov
pytest-django>=3.1.1
pytest>=3.0.4
pytest-capturelog
django-webtest
django-ckeditor<4.5.3
djangorestframework>=3.3,<3.4