feat(output): provide cwd to parsers

Author: rcarriga

rplugin/python3/ultest/handler/parsers/output/__init__.py

@@ -5,8 +5,8 @@
 from ....logging import get_logger
 from .base import ParseResult
 from .parsec import ParseError
-from .python.pytest import pytest_output
-from .python.unittest import unittest_output
+from .python.pytest import parse_pytest
+from .python.unittest import parse_unittest
 
 
 @dataclass
@@ -41,8 +41,8 @@ class OutputPatterns:
 class OutputParser:
     def __init__(self, disable_patterns: List[str]) -> None:
         self._parsers = {
-            "python#pytest": pytest_output,
-            "python#pyunit": unittest_output,
+            "python#pytest": parse_pytest,
+            "python#pyunit": parse_unittest,
         }
         self._patterns = {
             runner: patterns
@@ -53,10 +53,12 @@ def __init__(self, disable_patterns: List[str]) -> None:
     def can_parse(self, runner: str) -> bool:
         return runner in self._patterns or runner in self._parsers
 
-    def parse_failed(self, runner: str, output: str) -> Iterable[ParseResult]:
+    def parse_failed(self, runner: str, output: str, cwd=None) -> Iterable[ParseResult]:
         if runner in self._parsers:
             try:
-                return self._parsers[runner].parse(_ANSI_ESCAPE.sub("", output)).results
+                return self._parsers[runner](
+                    _ANSI_ESCAPE.sub("", output), cwd=cwd
+                ).results
             except ParseError:
                 return []
         return self._regex_parse_failed(runner, output.splitlines())

rplugin/python3/ultest/handler/parsers/output/python/pytest.py

@@ -1,5 +1,7 @@
+import os.path as path
 from dataclasses import dataclass
 from logging import getLogger
+from pathlib import Path
 from typing import List, Optional
 
 from .. import parsec as p
@@ -18,30 +20,42 @@ class PytestCodeTrace:
     message: Optional[List[str]] = None
 
 
-@generate
-def pytest_output():
-    yield pytest_test_results_summary
-    parsed_outputs = yield p.many1(failed_test_section)
-    parsed_summary = yield pytest_summary_info
+def parse_pytest(output: str, cwd: str = None):
+    parsed_outputs, parsed_summary = pytest_output.parse(output)
+
+    def convert_to_relative(file: str):
+        if not Path(file).is_absolute():
+            return file
+        return path.relpath(file, cwd)
+
     parsed_results = {
-        (r.file, r.name, *r.namespaces): r
+        (convert_to_relative(r.file), r.name, *r.namespaces): r
         for r in [*parsed_summary, *parsed_outputs]
         if r
     }
     return ParsedOutput(results=list(parsed_results.values()))
 
 
+@generate
+def pytest_output():
+    yield pytest_test_results_summary
+    parsed_outputs = yield p.many1(failed_test_section)
+    parsed_summary = yield pytest_summary_info
+    return parsed_outputs, parsed_summary
+
+
 @generate
 def failed_test_section():
     namespaces, test_name = yield failed_test_section_title
-    yield until_eol
     raw_output_lines = yield p.many1(
         p.exclude(until_eol, failed_test_section_title ^ pytest_summary_info_title)
     )
     output_text = "\n".join(raw_output_lines) + "\n"
     try:
 
-        file, err_msg, err_line = failed_test_section_output.parse(output_text)
+        file, err_msg, err_line = (
+            failed_test_section_output ^ failed_test_section_collection_error
+        ).parse(output_text)
         return ParseResult(
             name=test_name,
             namespaces=namespaces,
@@ -76,11 +90,34 @@ def failed_test_section_output():
     )
 
 
+@generate
+def failed_test_section_collection_error():
+    yield p.string("Traceback") >> until_eol
+    test_file = (
+        yield p.many1(p.string(" "))
+        >> p.string('File "')
+        >> p.many1(p.none_of('"')).parsecmap(join_chars)
+        << p.string('", ')
+    )
+    test_line_no = (
+        yield p.string("line ")
+        >> p.many1(p.digit()).parsecmap(join_chars).parsecmap(int)
+        << until_eol
+    )
+    yield p.many1(p.string(" ") >> until_eol)
+    error_message = yield until_eol
+    return (
+        test_file,
+        [error_message],
+        test_line_no,
+    )
+
+
 @generate
 def failed_test_section_title():
     yield p.string("_") >> p.many1(p.string("_")) >> p.space()
     name_elements = (
-        yield p.many1(p.none_of(" "))
+        yield p.many1(p.none_of(" ["))
         .parsecmap(join_chars)
         .parsecmap(lambda elems: elems.split("."))
     )

rplugin/python3/ultest/handler/parsers/output/python/unittest.py

@@ -8,6 +8,10 @@ class ErroredTestError(Exception):
     ...
 
 
+def parse_unittest(output: str, cwd: str = None):
+    return unittest_output.parse(output).results
+
+
 @generate
 def unittest_output():
     try:

rplugin/python3/ultest/handler/runner/__init__.py

@@ -188,7 +188,9 @@ async def run(cmd=cmd):
             (code, output_path) = await self._processes.run(
                 cmd, tree.data.file, tree.data.id, cwd=root, env=env
             )
-            self._process_results(tree, file_tree, code, output_path, runner, on_finish)
+            self._process_results(
+                tree, file_tree, code, output_path, runner, on_finish, root
+            )
 
         self._vim.launch(run(), tree.data.id)
 
@@ -200,6 +202,7 @@ def _process_results(
         output_path: str,
         runner: str,
         on_finish: Callable[[List[Tuple[Position, Result]]], None],
+        cwd: Optional[str] = None,
     ):
 
         namespaces = {
@@ -213,7 +216,7 @@ def _process_results(
                 output = cmd_out.read()
 
         parsed_failures = (
-            self._output_parser.parse_failed(runner, output) if code else []
+            self._output_parser.parse_failed(runner, output, cwd) if code else []
         )
         failed = {
             (failed.name, *(failed.namespaces)): failed for failed in parsed_failures

tests/unit/handler/parsers/output/python/test_pytest.py

@@ -82,6 +82,14 @@ def test_parse_file(self):
                     output=None,
                     line=23,
                 ),
+                ParseResult(
+                    name="test_parametrize[5]",
+                    namespaces=[],
+                    file="test_a.py",
+                    message=None,
+                    output=None,
+                    line=None,
+                ),
             ],
         )
 
@@ -336,3 +344,52 @@ def warn(msg, *args, **kwargs):
                 line=35,
             ),
         )
+
+    def test_parse_collection_error(self):
+        raw = """================================================= test session starts ==================================================
+platform linux -- Python 3.8.12, pytest-6.2.5, py-1.10.0, pluggy-1.0.0
+rootdir: /home/ronan/Dev/repos/hypothesis, configfile: pytest.ini
+plugins: xdist-2.4.0, forked-1.3.0, hypothesis-6.24.0
+collected 1 item
+
+examples/example_hypothesis_entrypoint/test_entrypoint.py F                                                      [100%]
+
+======================================================= FAILURES =======================================================
+___________________________________________ test_registered_from_entrypoint ____________________________________________
+Traceback (most recent call last):
+  File "/home/ronan/Dev/repos/hypothesis/hypothesis-python/examples/example_hypothesis_entrypoint/test_entrypoint.py", line 22, in test_registered_from_entrypoint
+    def test_registered_from_entrypoint(x):
+  File "/home/ronan/Dev/repos/hypothesis/hypothesis-python/src/hypothesis/core.py", line 1199, in wrapped_test
+    raise the_error_hypothesis_found
+  File "/home/ronan/Dev/repos/hypothesis/hypothesis-python/examples/example_hypothesis_entrypoint/example_hypothesis_entrypoint.py", line 25, in __init__
+    assert x >= 0, f"got {x}, but only positive numbers are allowed"
+AssertionError: got -1, but only positive numbers are allowed
+================================================= slowest 20 durations =================================================
+0.07s call     hypothesis-python/examples/example_hypothesis_entrypoint/test_entrypoint.py::test_registered_from_entrypoint
+
+(2 durations < 0.005s hidden.  Use -vv to show these durations.)
+=============================================== short test summary info ================================================
+FAILED examples/example_hypothesis_entrypoint/test_entrypoint.py::test_registered_from_entrypoint - AssertionError: g...
+================================================== 1 failed in 0.28s ===================================================
+
+"""
+        result = OutputParser([]).parse_failed(
+            "python#pytest",
+            raw,
+            cwd="/home/ronan/Dev/repos/hypothesis/hypothesis-python",
+        )
+        self.assertEqual(
+            [
+                ParseResult(
+                    name="test_registered_from_entrypoint",
+                    namespaces=[],
+                    file="/home/ronan/Dev/repos/hypothesis/hypothesis-python/examples/example_hypothesis_entrypoint/test_entrypoint.py",
+                    message=[
+                        "AssertionError: got -1, but only positive numbers are allowed"
+                    ],
+                    output=None,
+                    line=22,
+                )
+            ],
+            result,
+        )