From 894153074a9dca925ad86e340ce06268875c4f45 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Tue, 28 Nov 2017 11:27:56 +0100 Subject: [PATCH] tests: update for pytest 3.3 with merged catchlog (#20318) --- tests/test_broadcasting.py | 7 +++---- tox.ini | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/test_broadcasting.py b/tests/test_broadcasting.py index 58bb18f..4b4fa74 100644 --- a/tests/test_broadcasting.py +++ b/tests/test_broadcasting.py @@ -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' diff --git a/tox.ini b/tox.ini index 8ef71bf..740b6c6 100644 --- a/tox.ini +++ b/tox.ini @@ -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 -- 2.15.0