Do not fetch disabled remote plans in tmt run
#4749
+145
−3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2545,6 +2545,7 @@ def plans( | |||||
| links: Optional[list['LinkNeedle']] = None, | ||||||
| excludes: Optional[list[str]] = None, | ||||||
| apply_command_line: bool = True, | ||||||
| resolve_enabled_only: bool = False, | ||||||
| ) -> list["Plan"]: | ||||||
| """ | ||||||
| Search available plans | ||||||
|
|
@@ -2621,10 +2622,19 @@ def plans( | |||||
| for policy in run.policies: | ||||||
| policy.apply_to_plans(plans=plans, logger=logger) | ||||||
|
|
||||||
| if Plan._opt('enabled') or ('enabled:true' in filters): | ||||||
| resolve_enabled_only = True | ||||||
|
|
||||||
| if not Plan._opt('shallow'): | ||||||
| unresolved_plans = plans | ||||||
| plans = [] | ||||||
| for plan in unresolved_plans: | ||||||
| # Do not resolve disabled plans unless forced to | ||||||
| if resolve_enabled_only and not plan.enabled: | ||||||
| plan.debug( | ||||||
| f"Plan '{plan.name}' is not enabled, skipping imports resolution", | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
A consistency nitipick. |
||||||
| ) | ||||||
| continue | ||||||
| try: | ||||||
| plans += plan.resolve_imports() | ||||||
| except Exception as error: | ||||||
|
|
@@ -3144,7 +3154,7 @@ def load(self) -> None: | |||||
| else: | ||||||
| plan_names = [f"^{re.escape(plan_name)}$" for plan_name in self.data.plans] | ||||||
|
|
||||||
| self._plans = self.tree.plans(run=self, names=plan_names, resolve_enabled_only=True) | ||||||
|
|
||||||
| # Initialize steps only if not selected on the command line | ||||||
| step_options = ['all', 'since', 'until', 'after', 'before', 'skip'] | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1101,7 +1101,7 @@ def plans_show(context: Context, /, **kwargs: Any) -> None: | |
|
|
||
| logger = context.obj.logger.clone().apply_verbosity_options(**kwargs) | ||
|
|
||
| for plan in context.obj.tree.plans(logger=logger, resolve_enabled_only=False): | ||
| plan.show() | ||
| context.obj.print() | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh boy, what happened with all of the diff in this test?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, removed everything and added mine, will bring them back
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about adding a new test script to cover these scenarios? They are not
basicanymore... Perhapstests/plan/import/inaccessible.sh?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure separating one test case (with four sub-cases) makes much sense here. Maybe in the future when things like
plans showget covered more correctly?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's quite a long one, so would still lean toward the separation, but not a blocker.