robotcode-runner 2.6.2__py3-none-any.whl → 2.8.0.dev548__py3-none-any.whl

robotcode/runner/cli/results/_render.py

@@ -29,6 +29,7 @@ from .._markdown import (
     make_md_highlighter,
     md_escape,
     md_table,
+    metadata_md,
     path_paren,
     timing_suffix,
 )
@@ -51,7 +52,8 @@ from ._models import (
 # `show`); `LogTest` is the `log`-specific record carrying a body tree.
 # Both expose the fields the per-test renderers need (`full_name`,
 # `status`, `message`, `source`, `rel_source`, `lineno`, `elapsed_seconds`,
-# `start_time`), so we treat them interchangeably at the renderer level.
+# `start_time`, `metadata`), so we treat them interchangeably at the renderer
+# level.
 _TestLike = Union[TestResultItem, LogTest]
 
 _LEVEL_ORDER = {"TRACE": 0, "DEBUG": 1, "INFO": 2, "WARN": 3, "ERROR": 4, "FAIL": 5}
@@ -172,6 +174,7 @@ def render_show(
     data: ShowResult,
     *,
     show_tags: bool,
+    show_metadata: bool = False,
     full_paths: bool = False,
     show_timing: bool = False,
     sort_field: Optional[str] = None,
@@ -197,6 +200,8 @@ def render_show(
         if show_tags and t.tags:
             tags = ", ".join(highlight_md(md_escape(tag), highlight) for tag in t.tags)
             out.append(f"  - _Tags:_ {tags}")
+        if show_metadata and t.metadata:
+            out.append(f"  - _Metadata:_ {metadata_md(t.metadata, highlight)}")
 
     if data.truncated:
         out.append("")
@@ -490,6 +495,9 @@ def _test_header_md(
     head += _source_paren(t, full_paths=full_paths)
     head += f" {bold_status(t.status)}"
     head += timing_suffix(t.elapsed_seconds, t.start_time, show_timing=show_timing)
+    if t.metadata:
+        # a paragraph, not a list: a list would merge with the list of the test body below
+        head += f"\n\n_Metadata:_ {metadata_md(t.metadata, highlight)}"
     return head
 
 

robotcode/runner/cli/results/results.py

@@ -16,7 +16,7 @@ All subcommands respect the global `-f/--format` option:
 import re
 import shutil
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, Iterator, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, Iterator, List, Optional, Set, Tuple
 
 import click
 from robot.api import SuiteVisitor
@@ -41,11 +41,11 @@ from robot.result import (
     TryBranch,
     While,
 )
-from robot.result.executionerrors import ExecutionErrors
 from robot.result.model import BodyItem, StatusMixin
 from robot.utils import normalize
 
-from robotcode.modifiers import ByLongName, ExcludedByLongName
+from robotcode.modifiers import ByLongName, ByTestMetadata, ExcludedByLongName, ExcludedByTestMetadata
+from robotcode.modifiers.metadata_modifiers import MetadataPattern
 from robotcode.plugin import Application, OutputFormat, pass_application
 from robotcode.plugin.click_helper.types import add_options
 from robotcode.robot.config.loader import load_robot_config_from_path
@@ -63,7 +63,15 @@ from robotcode.robot.utils import RF_VERSION
 if TYPE_CHECKING:
     from robot.result import Error, Group, Var  # type: ignore[attr-defined,unused-ignore]
 
-from .._search import ByStatus, SearchMatcher, SearchModifier, make_search_matcher
+from .._robot_version import RobotVersionOption
+from .._search import (
+    ByStatus,
+    SearchMatcher,
+    SearchModifier,
+    get_test_metadata,
+    make_search_matcher,
+    named_metadata,
+)
 from . import _html, _render
 from ._models import (
     ArtifactRef,
@@ -143,6 +151,27 @@ RESULT_FILTER_OPTIONS = [
         metavar="NAME",
         help="Exclude tests/tasks or suites by long name (exact match).",
     ),
+    click.option(
+        "-btm",
+        "--by-test-metadata",
+        "by_test_metadata",
+        multiple=True,
+        metavar="PATTERN",
+        # test metadata exists since Robot Framework 7.5
+        cls=RobotVersionOption,
+        since=(7, 5),
+        help="Select tests/tasks by their metadata, for example `Issue:4409 AND Author:Hans*`.",
+    ),
+    click.option(
+        "-ebtm",
+        "--exclude-by-test-metadata",
+        "exclude_by_test_metadata",
+        multiple=True,
+        metavar="PATTERN",
+        cls=RobotVersionOption,
+        since=(7, 5),
+        help="Exclude tests/tasks by their metadata. Same patterns as `--by-test-metadata`.",
+    ),
 ]
 
 
@@ -199,7 +228,8 @@ SEARCH_OPTIONS = [
         help=(
             "Only include tests with at least one case-insensitive substring "
             "match against TEXT. Searches test name, full name, failure "
-            "message, documentation, template name, timeout, tags, the "
+            "message, documentation, template name, timeout, tags, test "
+            "metadata names and values, the "
             "parent suite's Documentation / Metadata, every executed "
             "keyword's name / arguments / [Documentation] / [Tags] / "
             "[Timeout] / failure message, and log messages. Mutually "
@@ -275,7 +305,7 @@ def results() -> None:
     "show_failed",
     default=False,
     show_default=True,
-    help="Include the list of failed tests (with messages) above the counts table.",
+    help="Include the list of failed tests (with messages) below the counts table.",
 )
 @FULL_PATHS_OPTION
 @pass_application
@@ -288,6 +318,8 @@ def summary(
     test_globs: Tuple[str, ...],
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
+    by_test_metadata: Tuple[str, ...],
+    exclude_by_test_metadata: Tuple[str, ...],
     search_substring: Optional[str],
     search_regex: Optional[str],
     output_file: Optional[Path],
@@ -297,7 +329,7 @@ def summary(
     """\
     Print headline counts and overall status for a finished run.
 
-    Pass `--failed` to also list failed tests above the counts.
+    Pass `--failed` to also list failed tests below the counts.
     Filter options narrow what is counted.
 
     \b
@@ -310,10 +342,14 @@ def summary(
     robotcode --format json results summary
     ```
     """
+    # before the result file is read, so an invalid pattern fails at once
+    matcher = make_search_matcher(search_substring, search_regex)
     profile, root_folder = _resolve_profile(app)
     with app.chdir(root_folder):
         path = _resolve_output_file(app, profile, output_file)
         execution = _load_execution_result(path)
+        # Before the tree filters, which would turn the copies of filtered-out messages into execution messages.
+        execution_messages = _execution_messages(execution)
 
         filters_active = bool(
             status_filters
@@ -323,10 +359,11 @@ def summary(
             or test_globs
             or by_longname
             or exclude_by_longname
+            or by_test_metadata
+            or exclude_by_test_metadata
             or search_substring
             or search_regex
         )
-        matcher = make_search_matcher(search_substring, search_regex)
         _apply_tree_filters(
             execution.suite,
             include_tags,
@@ -337,11 +374,13 @@ def summary(
             exclude_by_longname,
             status_filters,
             matcher,
+            by_test_metadata=by_test_metadata,
+            exclude_by_test_metadata=exclude_by_test_metadata,
         )
         counts = _collect_counts(execution.suite)
         failed = _collect_failures(execution.suite) if show_failed else None
-        exec_msg_counts = _count_execution_messages(execution.errors)
-        msg_counts = _count_all_messages(execution)
+        exec_msg_counts = _count_execution_messages(execution_messages)
+        msg_counts = _count_all_messages(execution.suite, execution_messages)
 
         data = SummaryResult(
             file=_make_file_info(path),
@@ -363,6 +402,8 @@ def summary(
                 exclude_by_longname,
                 search_substring,
                 search_regex,
+                by_test_metadata=by_test_metadata,
+                exclude_by_test_metadata=exclude_by_test_metadata,
             )
             if filters_active
             else None,
@@ -393,12 +434,22 @@ def summary(
 )
 @FULL_PATHS_OPTION
 @click.option(
-    "--tags/--no-tags",
+    "--show-tags/--no-show-tags",
     "show_tags",
     default=False,
     show_default=True,
     help="Append the tag list after each test.",
 )
+@click.option(
+    "--show-metadata/--no-show-metadata",
+    "show_metadata",
+    default=False,
+    show_default=True,
+    # test metadata exists since Robot Framework 7.5
+    cls=RobotVersionOption,
+    since=(7, 5),
+    help="Append the metadata after each test.",
+)
 @click.option(
     "--timing/--no-timing",
     "show_timing",
@@ -437,6 +488,8 @@ def show(
     test_globs: Tuple[str, ...],
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
+    by_test_metadata: Tuple[str, ...],
+    exclude_by_test_metadata: Tuple[str, ...],
     shortcut_failed: bool,
     shortcut_passed: bool,
     shortcut_skipped: bool,
@@ -447,6 +500,7 @@ def show(
     message_chars: int,
     full_paths: bool,
     show_tags: bool,
+    show_metadata: bool,
     show_timing: bool,
     sort_field: Optional[str],
     reverse: bool,
@@ -462,20 +516,21 @@ def show(
     ```
     robotcode results show
     robotcode results show --failed
-    robotcode results show --failed --skipped --tags
+    robotcode results show --failed --skipped --show-tags
     robotcode results show -i smoke -e wipANDnotready
     robotcode results show -s "MyProject.Login.*"
     robotcode results show --top 20
     robotcode results show --search "AssertionError"
     ```
     """
+    # before the result file is read, so an invalid pattern fails at once
+    matcher = make_search_matcher(search_substring, search_regex)
     profile, root_folder = _resolve_profile(app)
     with app.chdir(root_folder):
         path = _resolve_output_file(app, profile, output_file)
         execution = _load_execution_result(path)
 
         status_filters = _apply_status_shortcuts(status_filters, shortcut_failed, shortcut_passed, shortcut_skipped)
-        matcher = make_search_matcher(search_substring, search_regex)
         _apply_tree_filters(
             execution.suite,
             include_tags,
@@ -486,6 +541,8 @@ def show(
             exclude_by_longname,
             status_filters,
             matcher,
+            by_test_metadata=by_test_metadata,
+            exclude_by_test_metadata=exclude_by_test_metadata,
         )
 
         all_items = [_make_test_item(t, message_chars=message_chars) for t in _iter_all_tests(execution.suite)]
@@ -506,6 +563,8 @@ def show(
             or test_globs
             or by_longname
             or exclude_by_longname
+            or by_test_metadata
+            or exclude_by_test_metadata
             or search_substring
             or search_regex
         )
@@ -524,6 +583,8 @@ def show(
                 exclude_by_longname,
                 search_substring,
                 search_regex,
+                by_test_metadata=by_test_metadata,
+                exclude_by_test_metadata=exclude_by_test_metadata,
             )
             if filters_active
             else None,
@@ -537,6 +598,7 @@ def show(
                 _render.render_show(
                     data,
                     show_tags=show_tags,
+                    show_metadata=show_metadata,
                     full_paths=full_paths,
                     show_timing=show_timing,
                     sort_field=sort_field,
@@ -619,7 +681,10 @@ def show(
     "show_execution_messages",
     default=False,
     show_default=True,
-    help=("Also show parser/discovery messages from output.xml's `<errors>` section (deduplicated)."),
+    help=(
+        "Also show the messages of output.xml's `<errors>` section that come from outside the tests, "
+        "such as parsing and import errors."
+    ),
 )
 @click.option(
     "--keyword-info/--no-keyword-info",
@@ -653,6 +718,8 @@ def log(
     test_globs: Tuple[str, ...],
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
+    by_test_metadata: Tuple[str, ...],
+    exclude_by_test_metadata: Tuple[str, ...],
     shortcut_failed: bool,
     shortcut_passed: bool,
     shortcut_skipped: bool,
@@ -690,13 +757,16 @@ def log(
     robotcode results log --execution-messages
     ```
     """
+    # before the result file is read, so an invalid pattern fails at once
+    matcher = make_search_matcher(search_substring, search_regex)
     profile, root_folder = _resolve_profile(app)
     with app.chdir(root_folder):
         path = _resolve_output_file(app, profile, output_file)
         execution = _load_execution_result(path)
+        # Before the tree filters, which would turn the copies of filtered-out messages into execution messages.
+        execution_messages = _execution_messages(execution) if show_execution_messages else []
 
         status_filters = _apply_status_shortcuts(status_filters, shortcut_failed, shortcut_passed, shortcut_skipped)
-        matcher = make_search_matcher(search_substring, search_regex)
         _apply_tree_filters(
             execution.suite,
             include_tags,
@@ -707,6 +777,8 @@ def log(
             exclude_by_longname,
             status_filters,
             matcher,
+            by_test_metadata=by_test_metadata,
+            exclude_by_test_metadata=exclude_by_test_metadata,
         )
 
         collector = _LogCollector(
@@ -721,7 +793,7 @@ def log(
 
         exec_messages: Optional[List[LogEntry]] = None
         if show_execution_messages:
-            exec_messages = _collect_execution_messages(execution.errors, raw_html=raw_html) or None
+            exec_messages = _collect_execution_messages(execution_messages, raw_html=raw_html) or None
 
         extracted_count = 0
         extract_abs: Optional[Path] = None
@@ -738,6 +810,8 @@ def log(
             or test_globs
             or by_longname
             or exclude_by_longname
+            or by_test_metadata
+            or exclude_by_test_metadata
             or search_substring
             or search_regex
         )
@@ -761,6 +835,8 @@ def log(
                 exclude_by_longname,
                 search_substring,
                 search_regex,
+                by_test_metadata=by_test_metadata,
+                exclude_by_test_metadata=exclude_by_test_metadata,
             )
             if filters_active
             else None,
@@ -821,6 +897,8 @@ def stats(
     test_globs: Tuple[str, ...],
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
+    by_test_metadata: Tuple[str, ...],
+    exclude_by_test_metadata: Tuple[str, ...],
     shortcut_failed: bool,
     shortcut_passed: bool,
     shortcut_skipped: bool,
@@ -848,13 +926,14 @@ def stats(
     robotcode --format json results stats --by tag
     ```
     """
+    # before the result file is read, so an invalid pattern fails at once
+    matcher = make_search_matcher(search_substring, search_regex)
     profile, root_folder = _resolve_profile(app)
     with app.chdir(root_folder):
         path = _resolve_output_file(app, profile, output_file)
         execution = _load_execution_result(path)
 
         status_filters = _apply_status_shortcuts(status_filters, shortcut_failed, shortcut_passed, shortcut_skipped)
-        matcher = make_search_matcher(search_substring, search_regex)
         _apply_tree_filters(
             execution.suite,
             include_tags,
@@ -865,6 +944,8 @@ def stats(
             exclude_by_longname,
             status_filters,
             matcher,
+            by_test_metadata=by_test_metadata,
+            exclude_by_test_metadata=exclude_by_test_metadata,
         )
         tests = list(_iter_all_tests(execution.suite))
 
@@ -884,6 +965,8 @@ def stats(
             or test_globs
             or by_longname
             or exclude_by_longname
+            or by_test_metadata
+            or exclude_by_test_metadata
             or search_substring
             or search_regex
         )
@@ -900,6 +983,8 @@ def stats(
                 exclude_by_longname,
                 search_substring,
                 search_regex,
+                by_test_metadata=by_test_metadata,
+                exclude_by_test_metadata=exclude_by_test_metadata,
             )
             if filters_active
             else None,
@@ -1003,6 +1088,8 @@ def diff(
     test_globs: Tuple[str, ...],
     by_longname: Tuple[str, ...],
     exclude_by_longname: Tuple[str, ...],
+    by_test_metadata: Tuple[str, ...],
+    exclude_by_test_metadata: Tuple[str, ...],
     search_substring: Optional[str],
     search_regex: Optional[str],
     full_paths: bool,
@@ -1026,6 +1113,8 @@ def diff(
     robotcode --format json results diff baseline.xml
     ```
     """
+    # before the result file is read, so an invalid pattern fails at once
+    matcher = make_search_matcher(search_substring, search_regex)
     profile, root_folder = _resolve_profile(app)
     with app.chdir(root_folder):
         baseline_path = baseline.resolve()
@@ -1037,7 +1126,6 @@ def diff(
         baseline_exec = _load_execution_result(baseline_path)
         current_exec = _load_execution_result(current_path)
 
-        matcher = make_search_matcher(search_substring, search_regex)
         for suite in (baseline_exec.suite, current_exec.suite):
             _apply_tree_filters(
                 suite,
@@ -1049,6 +1137,8 @@ def diff(
                 exclude_by_longname,
                 status_filters,
                 matcher,
+                by_test_metadata=by_test_metadata,
+                exclude_by_test_metadata=exclude_by_test_metadata,
             )
 
         baseline_tests = {_get_full_name(t): t for t in _iter_all_tests(baseline_exec.suite)}
@@ -1089,6 +1179,8 @@ def diff(
             or test_globs
             or by_longname
             or exclude_by_longname
+            or by_test_metadata
+            or exclude_by_test_metadata
             or search_substring
             or search_regex
         )
@@ -1110,6 +1202,8 @@ def diff(
                 exclude_by_longname,
                 search_substring,
                 search_regex,
+                by_test_metadata=by_test_metadata,
+                exclude_by_test_metadata=exclude_by_test_metadata,
             )
             if filters_active
             else None,
@@ -1246,12 +1340,27 @@ def _candidate_paths(*, search_root: Path, out_dir: Path, out_name: str) -> List
     return cands
 
 
+# Robot Framework < 7.5 fails with one of these messages on a result file
+# that carries test-level `[Metadata]`: the first for `output.xml`, the
+# second for `output.json` (RF 7.2-7.4).
+_TEST_METADATA_READ_ERRORS = (
+    "Incompatible child element 'meta' for 'test'",
+    "'robot.result.TestCase' object does not have attribute 'metadata'",
+)
+
+
+def _test_metadata_hint(error: str) -> str:
+    if not any(text in error for text in _TEST_METADATA_READ_ERRORS):
+        return ""
+    return (
+        "\nThe file was written by Robot Framework 7.5 or newer and contains test metadata; "
+        "reading it requires Robot Framework 7.5+."
+    )
+
+
 def _load_execution_result(path: Path) -> Result:
     if path.suffix.lower() == ".json" and RF_VERSION < (7, 0):
-        raise click.ClickException(
-            f"Reading JSON result files requires Robot Framework 7.0+; "
-            f"got {'.'.join(str(v) for v in RF_VERSION)} (file: {path})."
-        )
+        raise click.ClickException(f"Reading JSON result files requires Robot Framework 7.0+ (file: {path}).")
     try:
         from robot.api import ExecutionResult
     except ImportError as e:
@@ -1259,7 +1368,7 @@ def _load_execution_result(path: Path) -> Result:
     try:
         return ExecutionResult(str(path))
     except DataError as e:
-        raise click.ClickException(f"failed to parse {path}: {e}") from e
+        raise click.ClickException(f"failed to parse {path}: {e}{_test_metadata_hint(str(e))}") from e
     except Exception as e:
         raise click.ClickException(f"failed to parse {path}: {e}") from e
 
@@ -1370,16 +1479,21 @@ def _apply_tree_filters(
     exclude_by_longname: Tuple[str, ...] = (),
     status_filters: Tuple[str, ...] = (),
     matcher: Optional[SearchMatcher] = None,
+    by_test_metadata: Tuple[str, ...] = (),
+    exclude_by_test_metadata: Tuple[str, ...] = (),
 ) -> None:
     """Apply every filter to the result tree in-place.
 
     Delegates the standard Robot filters (`--include`/`--exclude`,
     `--suite`, `--test`) to `TestSuite.filter()`, then bundles the
-    project-specific filters (`-bl`/`-ebl`, `--status`, search) into a
-    single `ModelModifier` pass so subsequent code can iterate the
-    suite naturally — every surviving test has passed every filter.
+    project-specific filters (`-bl`/`-ebl`, `-btm`/`-ebtm`, `--status`,
+    search) into a single `ModelModifier` pass so subsequent code can
+    iterate the suite naturally — every surviving test has passed every
+    filter.
     """
     try:
+        test_metadata_patterns = [MetadataPattern(p) for p in by_test_metadata]
+        excluded_test_metadata_patterns = [MetadataPattern(p) for p in exclude_by_test_metadata]
         suite.filter(
             included_suites=list(suite_globs) or None,
             included_tests=list(test_globs) or None,
@@ -1394,6 +1508,10 @@ def _apply_tree_filters(
         modifiers.append(ByLongName(*by_longname))
     if exclude_by_longname:
         modifiers.append(ExcludedByLongName(*exclude_by_longname))
+    if test_metadata_patterns:
+        modifiers.append(ByTestMetadata(*test_metadata_patterns))
+    if excluded_test_metadata_patterns:
+        modifiers.append(ExcludedByTestMetadata(*excluded_test_metadata_patterns))
     if matcher is not None:
         modifiers.append(SearchModifier(matcher))
     if status_filters:
@@ -1435,6 +1553,8 @@ def _filters_dict(
     exclude_by_longname: Tuple[str, ...] = (),
     search_substring: Optional[str] = None,
     search_regex: Optional[str] = None,
+    by_test_metadata: Tuple[str, ...] = (),
+    exclude_by_test_metadata: Tuple[str, ...] = (),
 ) -> Dict[str, List[str]]:
     out: Dict[str, List[str]] = {}
     if status_filters:
@@ -1451,6 +1571,11 @@ def _filters_dict(
         out["by-longname"] = list(by_longname)
     if exclude_by_longname:
         out["exclude-by-longname"] = list(exclude_by_longname)
+    # Metadata patterns are echoed as given, unlike the canonicalised tag patterns.
+    if by_test_metadata:
+        out["by-test-metadata"] = list(by_test_metadata)
+    if exclude_by_test_metadata:
+        out["exclude-by-test-metadata"] = list(exclude_by_test_metadata)
     if search_substring:
         out["search"] = [search_substring]
     if search_regex:
@@ -1549,6 +1674,7 @@ def _make_test_item(test: TestCase, *, message_chars: int) -> TestResultItem:
         message=truncated_msg,
         full_message=full_msg,
         tags=[normalize(str(t), ignore="_") for t in test.tags] if test.tags else None,
+        metadata=get_test_metadata(test) or None,
         elapsed_seconds=_elapsed_seconds(test),
         start_time=_iso(_start_time(test)),
         source=src_str,
@@ -1562,12 +1688,40 @@ def _collect_failures(suite: TestSuite) -> List[TestResultItem]:
     return [_make_test_item(t, message_chars=0) for t in _iter_all_tests(suite) if t.status == "FAIL"]
 
 
-def _count_execution_messages(errors: Optional[ExecutionErrors]) -> Dict[str, int]:
-    """Count execution.errors messages grouped by level. Returns empty dict if none."""
-    if errors is None:
-        return {}
+class _LoggedMessages(ResultVisitor):
+    """Collect the WARN/ERROR messages of a result tree by the key Robot Framework links them with."""
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.keys: Set[Tuple[Any, ...]] = set()
+
+    def visit_message(self, msg: Message) -> None:
+        if (msg.level or "").upper() in ("WARN", "ERROR"):
+            self.keys.add(_message_key(msg))
+
+
+def _message_key(msg: Message) -> Tuple[Any, ...]:
+    return (msg.message, msg.level, msg.timestamp)
+
+
+def _execution_messages(execution: Result) -> List[Message]:
+    """The messages of `output.xml`'s <errors> section that come from outside the tests, such as parsing and
+    import errors.
+
+    Robot Framework also copies every WARN and ERROR message logged by a test or keyword into <errors> and links the
+    copy to its original by message, level and timestamp. Those copies are left out here, matched the same way.
+    Call this before the suite tree is filtered."""
+    if execution.errors is None:
+        return []
+    logged = _LoggedMessages()
+    execution.suite.visit(logged)
+    return [m for m in execution.errors.messages if _message_key(m) not in logged.keys]
+
+
+def _count_execution_messages(messages: List[Message]) -> Dict[str, int]:
+    """Count execution messages grouped by level. Returns empty dict if none."""
     counts: Dict[str, int] = {}
-    for m in errors.messages:
+    for m in messages:
         level = (m.level or "INFO").upper()
         counts[level] = counts.get(level, 0) + 1
     return counts
@@ -1586,24 +1740,21 @@ class _MessageCounter(ResultVisitor):
             self.counts[level] = self.counts.get(level, 0) + 1
 
 
-def _count_all_messages(execution: Result) -> Dict[str, int]:
-    """Tally WARN/ERROR/FAIL across parser/discovery AND test runtime messages."""
+def _count_all_messages(suite: TestSuite, execution_messages: List[Message]) -> Dict[str, int]:
+    """Tally WARN/ERROR/FAIL across the test runtime messages and the execution messages, each message once."""
     counter = _MessageCounter()
-    # Parser / discovery errors live next to the suite tree, not inside it.
-    for m in execution.errors.messages:
+    for m in execution_messages:
         counter.visit_message(m)
     # Runtime messages — the visitor handles all suite/test/keyword traversal.
-    execution.suite.visit(counter)
+    suite.visit(counter)
     return counter.counts
 
 
-def _collect_execution_messages(errors: Optional[ExecutionErrors], *, raw_html: bool = False) -> List[LogEntry]:
-    """Collect parser/discovery messages from `output.xml`'s <errors> section
-    as LogEntry items, preserving order and individual timestamps."""
-    if errors is None:
-        return []
+def _collect_execution_messages(messages: List[Message], *, raw_html: bool = False) -> List[LogEntry]:
+    """Collect execution messages (see `_execution_messages`) as LogEntry items, preserving order and individual
+    timestamps."""
     out: List[LogEntry] = []
-    for m in errors.messages:
+    for m in messages:
         level = (m.level or "INFO").upper()
         text = m.message or ""
         is_html = bool(m.html)
@@ -1672,7 +1823,7 @@ class _LogCollector(ResultVisitor):
                     name=suite.name,
                     status=suite.status,
                     doc=suite.doc or None,
-                    metadata=dict(suite.metadata) if suite.metadata else None,
+                    metadata=named_metadata(suite.metadata) or None,
                     source=src_str,
                     rel_source=_rel_to_cwd(src_str),
                     elapsed_seconds=_elapsed_seconds(suite),
@@ -1707,6 +1858,7 @@ class _LogCollector(ResultVisitor):
                 elapsed_seconds=_elapsed_seconds(test),
                 start_time=_iso(_start_time(test)),
                 suite=parent_full_name,
+                metadata=get_test_metadata(test) or None,
             )
         )