Annotate warnings

- Refactor workflow command generation
- Skip warning annotations in Pytest < 6.0.0

Author: edgarrmondragon

plugin_test.py

@@ -6,14 +6,17 @@
 import pytest
 
 
+PYTEST_VERSION = version.parse(pytest.__version__)
 pytest_plugins = "pytester"
 
 
 # result.stderr.no_fnmatch_line() is added to testdir on pytest 5.3.0
 # https://docs.pytest.org/en/stable/changelog.html#pytest-5-3-0-2019-11-19
 def no_fnmatch_line(result, pattern):
-    if version.parse(pytest.__version__) >= version.parse("5.3.0"):
-        result.stderr.no_fnmatch_line(pattern + "*",)
+    if PYTEST_VERSION >= version.parse("5.3.0"):
+        result.stderr.no_fnmatch_line(
+            pattern + "*",
+        )
     else:
         assert pattern not in result.stderr.str()
 
@@ -47,7 +50,9 @@ def test_fail():
     testdir.monkeypatch.setenv("GITHUB_ACTIONS", "true")
     result = testdir.runpytest_subprocess()
     result.stderr.fnmatch_lines(
-        ["::error file=test_annotation_fail.py,line=5::test_fail*assert 0*",]
+        [
+            "::error file=test_annotation_fail.py,line=5::test_fail*assert 0*",
+        ]
     )
 
 
@@ -65,8 +70,56 @@ def test_fail():
     testdir.monkeypatch.setenv("GITHUB_ACTIONS", "true")
     result = testdir.runpytest_subprocess()
     result.stderr.fnmatch_lines(
-        ["::error file=test_annotation_exception.py,line=5::test_fail*oops*",]
+        [
+            "::error file=test_annotation_exception.py,line=5::test_fail*oops*",
+        ]
+    )
+
+
+@pytest.mark.skipif(
+    PYTEST_VERSION < version.parse("6.0.0"),
+    reason="requires pytest 6.0.0",
+)
+def test_annotation_warning(testdir):
+    testdir.makepyfile(
+        """
+        import warnings
+        import pytest
+        pytest_plugins = 'pytest_github_actions_annotate_failures'
+
+        def test_warning():
+            warnings.warn('beware', Warning)
+            assert 1
+        """
     )
+    testdir.monkeypatch.setenv("GITHUB_ACTIONS", "true")
+    result = testdir.runpytest_subprocess()
+    result.stderr.fnmatch_lines(
+        [
+            "::warning file=test_annotation_warning.py,line=6::beware",
+        ]
+    )
+
+
+@pytest.mark.skipif(
+    PYTEST_VERSION < version.parse("6.0.0"),
+    reason="requires pytest 6.0.0",
+)
+def test_annotation_exclude_warnings(testdir):
+    testdir.makepyfile(
+        """
+        import warnings
+        import pytest
+        pytest_plugins = 'pytest_github_actions_annotate_failures'
+
+        def test_warning():
+            warnings.warn('beware', Warning)
+            assert 1
+        """
+    )
+    testdir.monkeypatch.setenv("GITHUB_ACTIONS", "true")
+    result = testdir.runpytest_subprocess("--exclude-warnings")
+    assert not result.stderr.lines
 
 
 def test_annotation_third_party_exception(testdir):
@@ -90,7 +143,43 @@ def test_fail():
     testdir.monkeypatch.setenv("GITHUB_ACTIONS", "true")
     result = testdir.runpytest_subprocess()
     result.stderr.fnmatch_lines(
-        ["::error file=test_annotation_third_party_exception.py,line=6::test_fail*oops*",]
+        [
+            "::error file=test_annotation_third_party_exception.py,line=6::test_fail*oops*",
+        ]
+    )
+
+
+@pytest.mark.skipif(
+    PYTEST_VERSION < version.parse("6.0.0"),
+    reason="requires pytest 6.0.0",
+)
+def test_annotation_third_party_warning(testdir):
+    testdir.makepyfile(
+        my_module="""
+        import warnings
+
+        def fn():
+            warnings.warn('beware', Warning)
+        """
+    )
+
+    testdir.makepyfile(
+        """
+        import pytest
+        from my_module import fn
+        pytest_plugins = 'pytest_github_actions_annotate_failures'
+
+        def test_warning():
+            fn()
+        """
+    )
+    testdir.monkeypatch.setenv("GITHUB_ACTIONS", "true")
+    result = testdir.runpytest_subprocess()
+    result.stderr.fnmatch_lines(
+        # ["::warning file=test_annotation_third_party_warning.py,line=6::beware",]
+        [
+            "::warning file=my_module.py,line=4::beware",
+        ]
     )
 
 
@@ -127,7 +216,9 @@ def test_fail():
     testdir.makefile(".ini", pytest="[pytest]\ntestpaths=..")
     result = testdir.runpytest_subprocess("--rootdir=foo")
     result.stderr.fnmatch_lines(
-        ["::error file=test_annotation_fail_cwd.py,line=5::test_fail*assert 0*",]
+        [
+            "::error file=test_annotation_fail_cwd.py,line=5::test_fail*assert 0*",
+        ]
     )
 
 
@@ -145,7 +236,9 @@ def test_fail():
     testdir.monkeypatch.setenv("PYTEST_RUN_PATH", "some_path")
     result = testdir.runpytest_subprocess()
     result.stderr.fnmatch_lines(
-        ["::error file=some_path/test_annotation_fail_runpath.py,line=5::test_fail*assert 0*",]
+        [
+            "::error file=some_path/test_annotation_fail_runpath.py,line=5::test_fail*assert 0*",
+        ]
     )
 
 

pytest_github_actions_annotate_failures/plugin.py

@@ -3,7 +3,8 @@
 
 import os
 import sys
-from collections import OrderedDict
+
+from packaging import version
 
 import pytest
 
@@ -16,6 +17,9 @@
 # https://github.com/pytest-dev/pytest/blob/master/src/_pytest/terminal.py
 
 
+PYTEST_VERSION = version.parse(pytest.__version__)
+
+
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)
 def pytest_runtest_makereport(item, call):
     # execute all other hooks to obtain the report object
@@ -71,25 +75,92 @@ def pytest_runtest_makereport(item, call):
         elif isinstance(report.longrepr, str):
             longrepr += "\n\n" + report.longrepr
 
-        print(
-            _error_workflow_command(filesystempath, lineno, longrepr), file=sys.stderr
+        workflow_command = _build_workflow_command(
+            "error",
+            filesystempath,
+            lineno,
+            message=longrepr,
         )
+        print(workflow_command, file=sys.stderr)
 
 
-def _error_workflow_command(filesystempath, lineno, longrepr):
-    # Build collection of arguments. Ordering is strict for easy testing
-    details_dict = OrderedDict()
-    details_dict["file"] = filesystempath
-    if lineno is not None:
-        details_dict["line"] = lineno
+class _AnnotateWarnings:
+    def pytest_warning_recorded(self, warning_message, when, nodeid, location):
+        # enable only in a workflow of GitHub Actions
+        # ref: https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables
+        if os.environ.get("GITHUB_ACTIONS") != "true":
+            return
 
-    details = ",".join("{}={}".format(k, v) for k, v in details_dict.items())
+        filesystempath = warning_message.filename
+        workspace = os.environ.get("GITHUB_WORKFLOW")
+
+        if workspace:
+            try:
+                rel_path = os.path.relpath(filesystempath, workspace)
+            except ValueError:
+                # os.path.relpath() will raise ValueError on Windows
+                # when full_path and workspace have different mount points.
+                rel_path = filesystempath
+            if not rel_path.startswith(".."):
+                filesystempath = rel_path
+        else:
+            filesystempath = os.path.relpath(filesystempath)
+
+        workflow_command = _build_workflow_command(
+            "warning",
+            filesystempath,
+            warning_message.lineno,
+            message=warning_message.message.args[0],
+        )
+        print(workflow_command, file=sys.stderr)
+
+
+if PYTEST_VERSION >= version.parse("6.0.0"):
+
+    def pytest_addoption(parser):
+        group = parser.getgroup("pytest_github_actions_annotate_failures")
+        group.addoption(
+            "--exclude-warnings",
+            action="store_true",
+            default=False,
+            help="Annotate failures in GitHub Actions.",
+        )
 
-    if longrepr is None:
-        return "\n::error {}".format(details)
-    else:
-        longrepr = _escape(longrepr)
-        return "\n::error {}::{}".format(details, longrepr)
+    def pytest_configure(config):
+        if not config.option.exclude_warnings:
+            config.pluginmanager.register(_AnnotateWarnings(), "annotate_warnings")
+
+
+def _build_workflow_command(
+    command_name,
+    file,
+    line,
+    end_line=None,
+    column=None,
+    end_column=None,
+    title=None,
+    message=None,
+):
+    """Build a command to annotate a workflow."""
+    result = "::{} ".format(command_name)
+
+    entries = [
+        ("file", file),
+        ("line", line),
+        ("endLine", end_line),
+        ("col", column),
+        ("endColumn", end_column),
+        ("title", title),
+    ]
+
+    result = result + ",".join(
+        "{}={}".format(k, v) for k, v in entries if v is not None
+    )
+
+    if message is not None:
+        result = result + "::" + _escape(message)
+
+    return result
 
 
 def _escape(s):

tox.ini

@@ -31,7 +31,7 @@ deps =
     pytest6: pytest>=6.0.0,<7.0.0
     pytest7: pytest>=7.0.0,<8.0.0
 
-commands = {envpython} -m pytest
+commands = {envpython} -m pytest {posargs}
 
 [testenv:pkg]
 skip_install = true