From d7a7d65d9eb9440c9136db53e41687e4f57f1943 Mon Sep 17 00:00:00 2001 From: Josue Kouka Date: Tue, 28 Nov 2017 11:44:41 +0100 Subject: [PATCH] tests: use caplog merged in pytest 3.3 (#20321) --- tests/test_mandayejs.py | 6 +++--- tox.ini | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/test_mandayejs.py b/tests/test_mandayejs.py index 0c88b14..f9d700c 100644 --- a/tests/test_mandayejs.py +++ b/tests/test_mandayejs.py @@ -266,7 +266,7 @@ def test_phantom_invalid_json(mocked_popen, caplog, user_john): assert message.level_tag == 'error' assert message.message == 'invalid response from server' - for record in caplog.records(): + for record in caplog.records: if record.levelname == 'ERROR': assert record.message == 'invalid json: This is not a valid JSON' @@ -284,7 +284,7 @@ def test_phantom_js_errors(mocked_popen, caplog): mocked_popen.return_value = MockedPopen(expected_output=expected_output) result = exec_phantom(LOGIN_INFO) - for record in caplog.records(): + for record in caplog.records: assert record.levelname == 'WARNING' assert record.message == "ERROR: TypeError: undefined is not a function (evaluating \'$( \"#datepicker\" )" @@ -297,7 +297,7 @@ def test_phantom_js_timeout(mocked_popen, caplog): mocked_popen.return_value = MockedPopen(expected_output=json.dumps({'whatever': 'whatever'}), stall_for=True) result = exec_phantom(LOGIN_INFO) - for record in caplog.records(): + for record in caplog.records: assert record.levelname == 'ERROR' assert 'https://whatever.com' in record.message assert 'tenants/static/js/auth.checker.js' in record.message diff --git a/tox.ini b/tox.ini index 541b042..8673982 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,6 @@ deps = pytest-cov pytest-django pytest - pytest-capturelog pylint pylint-django mock -- 2.11.0