From 599693b729a5b0e12f31eeebf122bbb9f2ffba24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jim=20Br=C3=A4nnlund?= <jimbrannlund@fastmail.com>
Date: Wed, 13 May 2020 10:03:32 +0200
Subject: [PATCH] Better fix for TerminalReporter issue

---
 testing/test_pytest_html.py | 24 +++++++-----------------
 tox.ini                     |  4 ++++
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/testing/test_pytest_html.py b/testing/test_pytest_html.py
index f19fee0f..6f349b2e 100644
--- a/testing/test_pytest_html.py
+++ b/testing/test_pytest_html.py
@@ -14,20 +14,15 @@
 pytest_plugins = ("pytester",)
 
 
-def handle_tr_writer_deprecation():
-    # Remove this function when they've fixed
+def remove_deprecation_from_recwarn(recwarn):
+    # TODO: Temporary hack until they fix
     # https://github.com/pytest-dev/pytest/issues/6936
-    import warnings
-    from _pytest.warnings import _setoption
-
-    arg = "ignore:TerminalReporter.writer:pytest.PytestDeprecationWarning"
-    _setoption(warnings, arg)
+    return [
+        item for item in recwarn if "TerminalReporter.writer" not in repr(item.message)
+    ]
 
 
 def run(testdir, path="report.html", *args):
-    # TODO: Temporary hack until they fix
-    # https://github.com/pytest-dev/pytest/issues/6936
-    handle_tr_writer_deprecation()  # TODO: Temporary hack
     path = testdir.tmpdir.join(path)
     result = testdir.runpytest("--html", path, *args)
     return result, read_html(path)
@@ -232,9 +227,6 @@ def test_report_title(self, testdir, path):
         assert report_title in html
 
     def test_report_title_addopts_env_var(self, testdir, monkeypatch):
-        # TODO: Temporary hack until they fix
-        # https://github.com/pytest-dev/pytest/issues/6936
-        handle_tr_writer_deprecation()
         report_location = "REPORT_LOCATION"
         report_name = "MuhReport"
         monkeypatch.setenv(report_location, report_name)
@@ -881,7 +873,8 @@ def test_css(self, testdir, recwarn, colors):
             cssargs.extend(["--css", path])
         result, html = run(testdir, "report.html", "--self-contained-html", *cssargs)
         assert result.ret == 0
-        assert len(recwarn) == 0
+        warnings = remove_deprecation_from_recwarn(recwarn)
+        assert len(warnings) == 0
         for k, v in css.items():
             assert str(v["path"]) in html
             assert v["style"] in html
@@ -894,9 +887,6 @@ def test_css_invalid(self, testdir, recwarn):
         assert "No such file or directory: 'style.css'" in result.stderr.str()
 
     def test_css_invalid_no_html(self, testdir):
-        # TODO: Temporary hack until they fix
-        # https://github.com/pytest-dev/pytest/issues/6936
-        handle_tr_writer_deprecation()
         testdir.makepyfile("def test_pass(): pass")
         result = testdir.runpytest("--css", "style.css")
         assert result.ret == 0
diff --git a/tox.ini b/tox.ini
index 6a9cc242..feec50a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,3 +27,7 @@ exclude = .eggs,.tox
 
 [pytest]
 testpaths = testing
+# TODO: Temporary hack until they fix
+# https://github.com/pytest-dev/pytest/issues/6936
+filterwarnings =
+    ignore:.*TerminalReporter.writer attribute is deprecated.*:pytest.PytestDeprecationWarning