Refactor filtering of valid targets via the engine #9614
Merged
Conversation
This file contains 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
# Delete this line to force CI to run Clippy and the Rust tests. [ci skip-rust-tests] # Delete this line to force CI to run the JVM tests. [ci skip-jvm-tests]
# Delete this line to force CI to run Clippy and the Rust tests. [ci skip-rust-tests] # Delete this line to force CI to run the JVM tests. [ci skip-jvm-tests]
Eric-Arellano
commented
Apr 22, 2020
Comment on lines
-66
to
-78
| bulleted_list_sep = "\n * " | ||
|
|
||
| if len(targets_to_valid_configs) > 1: | ||
| binary_target_addresses = sorted(tgt.address.spec for tgt in targets_to_valid_configs) | ||
| raise ValueError( | ||
| f"The `run` goal only works on one binary target but was given multiple targets that " | ||
| f"can produce a binary:" | ||
| f"{bulleted_list_sep}{bulleted_list_sep.join(binary_target_addresses)}\n\n" | ||
| f"Please select one of these targets to run." | ||
| ) | ||
|
|
||
| target, valid_configs = list(targets_to_valid_configs.items())[0] | ||
| if len(valid_configs) > 1: |
There was a problem hiding this comment.
All factored out to now be expect_single_config=True :)
| exit_code, stdout = self.run_test_rule( | ||
| config=SuccessfulConfiguration, targets=[self.make_target_with_origin()], debug=True, | ||
| ) | ||
| assert exit_code == 0 | ||
|
|
||
| def test_multiple_debug_targets_fail(self) -> None: |
There was a problem hiding this comment.
This logic no longer lives in test.py. It's now in engine/target.py. It would be meaningless to include the test here because this is a run_rule-style test, so we would need to mock out the behavior of await Get[TargetsToValidConfigurations] and wouldn't actually test anything meaningful to test.py.
| {tgt_with_origin: tuple(configs) for tgt_with_origin, configs in mapping.items()} | ||
| ) | ||
|
|
||
| @memoized_property |
There was a problem hiding this comment.
I think it makes sense to memoize this? The idea is to avoid having to re-iterate over the collection multiple times.
| def __init__( | ||
| self, | ||
| targets_with_origins: TargetsWithOrigins, | ||
| *, | ||
| valid_target_types: Iterable[Type[Target]], | ||
| goal_name: str, | ||
| goal_description: str, |
There was a problem hiding this comment.
This change was necessary so that we can say test --debug in an error message, instead of the 'test' goal.
stuhood
approved these changes
Apr 22, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This builds on top of #9605 to better support the pattern of a
@goal_rulefiltering out irrelevant targets and converting them into its subclass' configurations.Note that this pattern does not apply to every
@goal_rule. Many@goal_rules are simpler and have no downstream rules - they can avoid configurations entirely, likelist_targets.py. Others are more complex, likelint.pyandfmt.pyneeding to batch Configurations, rather than working on a per-target basis.