From 28cbae546d35c6c4ef0e36309c935e6a21ba5ce2 Mon Sep 17 00:00:00 2001 From: Julien Duponchelle Date: Tue, 17 Jan 2017 18:56:06 +0100 Subject: [PATCH] Fix tests broken by recent pytest upgrades --- dev-requirements.txt | 3 +-- tests/web/test_logger.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 2cc22521..afb4d42e 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -3,6 +3,5 @@ sphinx==1.5.1 pytest==3.0.5 pep8==1.7.0 -pytest-capturelog==0.7 -pytest-cov==2.4.0 +pytest-catchlog==1.2.2 pytest-timeout==1.2.0 diff --git a/tests/web/test_logger.py b/tests/web/test_logger.py index 5867157d..08b1b358 100644 --- a/tests/web/test_logger.py +++ b/tests/web/test_logger.py @@ -24,27 +24,27 @@ def test_init_logger(caplog): logger = init_logger(logging.DEBUG) logger.debug("DEBUG1") - assert "DEBUG1" in caplog.text() + assert "DEBUG1" in caplog.text logger.info("INFO1") - assert "INFO1" in caplog.text() + assert "INFO1" in caplog.text logger.warn("WARN1") - assert "WARN1" in caplog.text() + assert "WARN1" in caplog.text logger.error("ERROR1") - assert "ERROR1" in caplog.text() + assert "ERROR1" in caplog.text logger.critical("CRITICAL1") - assert "CRITICAL1" in caplog.text() + assert "CRITICAL1" in caplog.text def test_init_logger_quiet(caplog): logger = init_logger(logging.DEBUG, quiet=True) logger.debug("DEBUG1") - assert "DEBUG1" not in caplog.text() + assert "DEBUG1" not in caplog.text logger.info("INFO1") - assert "INFO1" not in caplog.text() + assert "INFO1" not in caplog.text logger.warn("WARN1") - assert "WARN1" not in caplog.text() + assert "WARN1" not in caplog.text logger.error("ERROR1") - assert "ERROR1" not in caplog.text() + assert "ERROR1" not in caplog.text logger.critical("CRITICAL1") - assert "CRITICAL1" not in caplog.text() + assert "CRITICAL1" not in caplog.text