From 2cdc32ca5840b4f4804c97ef1ff6c85053f10714 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 4 Dec 2017 16:55:57 +0100
Subject: [PATCH] Remove pytest-catchlog

---
 misc/requirements/requirements-tests-git.txt |  6 ------
 misc/requirements/requirements-tests.txt     |  1 -
 misc/requirements/requirements-tests.txt-raw |  1 -
 tests/helpers/logfail.py                     | 17 ++++-----------
 tests/helpers/test_logfail.py                | 22 --------------------
 tests/unit/utils/test_log.py                 |  6 +++---
 6 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/misc/requirements/requirements-tests-git.txt b/misc/requirements/requirements-tests-git.txt
index 6b31140bb..6681dd15e 100644
--- a/misc/requirements/requirements-tests-git.txt
+++ b/misc/requirements/requirements-tests-git.txt
@@ -12,12 +12,6 @@ git+https://github.com/jenisys/parse_type.git
 hg+https://bitbucket.org/pytest-dev/py
 git+https://github.com/pytest-dev/pytest.git@features
 git+https://github.com/pytest-dev/pytest-bdd.git
-
-# This is broken at the moment because logfail tries to access
-# LogCaptureHandler
-# git+https://github.com/eisensheng/pytest-catchlog.git
-pytest-catchlog==1.2.2
-
 git+https://github.com/pytest-dev/pytest-cov.git
 git+https://github.com/pytest-dev/pytest-faulthandler.git
 git+https://github.com/pytest-dev/pytest-instafail.git
diff --git a/misc/requirements/requirements-tests.txt b/misc/requirements/requirements-tests.txt
index 37fd891db..58644a500 100644
--- a/misc/requirements/requirements-tests.txt
+++ b/misc/requirements/requirements-tests.txt
@@ -23,7 +23,6 @@ py-cpuinfo==3.3.0
 pytest==3.3.0
 pytest-bdd==2.19.0
 pytest-benchmark==3.1.1
-pytest-catchlog==1.2.2
 pytest-cov==2.5.1
 pytest-faulthandler==1.3.1
 pytest-instafail==0.3.0
diff --git a/misc/requirements/requirements-tests.txt-raw b/misc/requirements/requirements-tests.txt-raw
index bc44bc8e1..121689980 100644
--- a/misc/requirements/requirements-tests.txt-raw
+++ b/misc/requirements/requirements-tests.txt-raw
@@ -7,7 +7,6 @@ hypothesis
 pytest
 pytest-bdd
 pytest-benchmark
-pytest-catchlog
 pytest-cov
 pytest-faulthandler
 pytest-instafail
diff --git a/tests/helpers/logfail.py b/tests/helpers/logfail.py
index 3d8e3afb8..ba7ed24b8 100644
--- a/tests/helpers/logfail.py
+++ b/tests/helpers/logfail.py
@@ -22,16 +22,7 @@
 import logging
 
 import pytest
-
-try:
-    import pytest_catchlog as catchlog_mod
-except ImportError:
-    # When using pytest for pyflakes/pep8/..., the plugin won't be available
-    # but conftest.py will still be loaded.
-    #
-    # However, LogFailHandler.emit will never be used in that case, so we just
-    # ignore the ImportError.
-    pass
+import _pytest.logging
 
 
 class LogFailHandler(logging.Handler):
@@ -50,8 +41,8 @@ class LogFailHandler(logging.Handler):
             return
 
         for h in root_logger.handlers:
-            if isinstance(h, catchlog_mod.LogCaptureHandler):
-                catchlog_handler = h
+            if isinstance(h, _pytest.logging.LogCaptureHandler):
+                capture_handler = h
                 break
         else:
             # The LogCaptureHandler is not available anymore during fixture
@@ -59,7 +50,7 @@ class LogFailHandler(logging.Handler):
             return
 
         if (logger.level == record.levelno or
-                catchlog_handler.level == record.levelno):
+                capture_handler.level == record.levelno):
             # caplog.at_level(...) was used with the level of this message,
             # i.e.  it was expected.
             return
diff --git a/tests/helpers/test_logfail.py b/tests/helpers/test_logfail.py
index b95dec1d6..48aaaa201 100644
--- a/tests/helpers/test_logfail.py
+++ b/tests/helpers/test_logfail.py
@@ -23,7 +23,6 @@
 import logging
 
 import pytest
-import pytest_catchlog
 
 
 def test_log_debug():
@@ -64,24 +63,3 @@ def test_log_expected_wrong_logger(caplog):
     with pytest.raises(pytest.fail.Exception):
         with caplog.at_level(logging.ERROR, logger):
             logging.error('foo')
-
-
-@pytest.fixture
-def skipping_fixture():
-    pytest.skip("Skipping to test caplog workaround.")
-
-
-def test_caplog_bug_workaround_1(caplog, skipping_fixture):
-    pass
-
-
-def test_caplog_bug_workaround_2():
-    """Make sure caplog_bug_workaround works correctly after a skipped test.
-
-    There should be only one capturelog handler.
-    """
-    caplog_handler = None
-    for h in logging.getLogger().handlers:
-        if isinstance(h, pytest_catchlog.LogCaptureHandler):
-            assert caplog_handler is None
-            caplog_handler = h
diff --git a/tests/unit/utils/test_log.py b/tests/unit/utils/test_log.py
index 30dd5d634..2ab51002d 100644
--- a/tests/unit/utils/test_log.py
+++ b/tests/unit/utils/test_log.py
@@ -27,7 +27,7 @@ import warnings
 
 import attr
 import pytest
-import pytest_catchlog
+import _pytest.logging
 
 from qutebrowser.utils import log
 from qutebrowser.misc import utilcmds
@@ -66,11 +66,11 @@ def restore_loggers():
     while root_logger.handlers:
         h = root_logger.handlers[0]
         root_logger.removeHandler(h)
-        if not isinstance(h, pytest_catchlog.LogCaptureHandler):
+        if not isinstance(h, _pytest.logging.LogCaptureHandler):
             h.close()
     root_logger.setLevel(original_logging_level)
     for h in root_handlers:
-        if not isinstance(h, pytest_catchlog.LogCaptureHandler):
+        if not isinstance(h, _pytest.logging.LogCaptureHandler):
             # https://github.com/qutebrowser/qutebrowser/issues/856
             root_logger.addHandler(h)
     logging._acquireLock()