Merge pull request #283 from christiansandberg/282-remove-funcargs

Remove usage of funcargs

Author: BeyondEvil

pytest_html/plugin.py

@@ -95,13 +95,13 @@ def pytest_runtest_makereport(item, call):
     outcome = yield
     report = outcome.get_result()
     if report.when == "call":
-        fixture_extras = item.funcargs.get("extra", [])
+        fixture_extras = getattr(item.config, "extras", [])
         plugin_extras = getattr(report, "extra", [])
         report.extra = fixture_extras + plugin_extras
 
 
 @pytest.fixture
-def extra():
+def extra(pytestconfig):
     """Add details to the HTML reports.
 
     .. code-block:: python
@@ -110,7 +110,9 @@ def extra():
         def test_foo(extra):
             extra.append(pytest_html.extras.url('http://www.example.com/'))
     """
-    return []
+    pytestconfig.extras = []
+    yield pytestconfig.extras
+    del pytestconfig.extras[:]
 
 
 def data_uri(content, mime_type="text/plain", charset="utf-8"):

testing/test_pytest_html.py

@@ -14,7 +14,20 @@
 pytest_plugins = ("pytester",)
 
 
+def handle_tr_writer_deprecation():
+    # Remove this function when they've fixed
+    # https://github.com/pytest-dev/pytest/issues/6936
+    import warnings
+    from _pytest.warnings import _setoption
+
+    arg = "ignore:TerminalReporter.writer:pytest.PytestDeprecationWarning"
+    _setoption(warnings, arg)
+
+
 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)
@@ -219,6 +232,9 @@ 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)
@@ -878,6 +894,9 @@ 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