Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cover tmt.trying with pyright check #2942

Merged
merged 1 commit into from
May 28, 2024
Merged

Cover tmt.trying with pyright check #2942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ ignore = [
"tmt/convert.py",
"tmt/lint.py",
"tmt/queue.py",
"tmt/trying.py",
"tmt/utils.py"
]

Expand Down
27 changes: 16 additions & 11 deletions tmt/trying.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,18 @@
import enum
import re
import textwrap
from typing import Any
from collections.abc import Iterator
from typing import Any, cast

import click
import fmf
from fmf.utils import listed
import fmf.utils

import tmt
import tmt.base
import tmt.log
import tmt.steps
import tmt.steps.execute
import tmt.steps.provision
import tmt.templates
import tmt.utils
Expand Down Expand Up @@ -130,7 +133,7 @@ def check_tests(self) -> None:
self.tests = self.tree.tests(names=test_names)
if not self.tests:
raise tmt.utils.GeneralError(
f"No test matching '{listed(test_names)}' found.")
f"No test matching '{fmf.utils.listed(test_names)}' found.")

# Default to tests under the current working directory
else:
Expand All @@ -144,7 +147,7 @@ def check_tests(self) -> None:
self.warn(f"No tests found under the '{relative_path}' directory.")

# Short debug info about what was found
self.debug("Test name filter", listed(test_names, quote="'"))
self.debug("Test name filter", fmf.utils.listed(test_names, quote="'"))
self.debug("Matching tests found\n" + tmt.utils.format_value(self.tests))

# Inject the test filtering options into the Test class
Expand All @@ -160,10 +163,12 @@ def get_default_plans(self, run: tmt.base.Run) -> list[Plan]:
try:
config_tree = tmt.utils.Config().fmf_tree
plan_name = re.escape(USER_PLAN_NAME)
user_plans = list(config_tree.prune(names=[f"^{plan_name}"]))
# cast: once fmf is properly annotated, cast() would not be needed.
# pyright isn't able to infer the type.
user_plans = list(cast(Iterator[fmf.Tree], config_tree.prune(names=[f"^{plan_name}"])))
if user_plans:
for user_plan in user_plans:
plan_dict = {user_plan.name: user_plan.data}
plan_dict: dict[str, Any] = {user_plan.name: user_plan.data}
self.tree.tree.update(plan_dict)
self.debug("Use the default user plan config.")
return self.tree.plans(names=[f"^{plan_name}"], run=run)
Expand All @@ -183,11 +188,11 @@ def check_plans(self, run: tmt.base.Run) -> None:
# Search for matching plans if plan names provided
plan_names = list(self.opt("plan"))
if plan_names:
self.debug("Plan names filter", listed(plan_names, quote="'"))
self.debug("Plan names filter", fmf.utils.listed(plan_names, quote="'"))
self.plans = self.tree.plans(names=plan_names, run=run)
if not self.plans:
raise tmt.utils.GeneralError(
f"No plan matching '{listed(plan_names)}' found.")
f"No plan matching '{fmf.utils.listed(plan_names)}' found.")

# Use default plans if no plan names requested
else:
Expand All @@ -212,20 +217,20 @@ def welcome(self) -> None:
if self.opt("login"):
parts += [click.style("login", fg="red")]
elif test_names and not self.opt("ask"):
parts += [listed(test_names, 'test', max=3)]
parts += [fmf.utils.listed(test_names, 'test', max=3)]
else:
parts += ["something"]
parts += ["with"]

# Plan names
plan_names = [click.style(plan, fg="magenta") for plan in self.plans]
parts += [listed(plan_names, 'plan', max=3)]
parts += [fmf.utils.listed(plan_names, 'plan', max=3)]

# Image names
if self.image_and_how:
parts += ["on"]
image_names = [click.style(image, fg="blue") for image in self.image_and_how]
parts += [listed(image_names)]
parts += [fmf.utils.listed(image_names)]

self.print(" ".join(parts) + ".")

Expand Down
Loading