disambiguate get_override_key treatment of global #1791
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
facebook-github-bot
added
the
CLA Signed
Jasha10
commented
Aug 25, 2021
omry
reviewed
Aug 25, 2021
| @@ -1,2 +1,2 @@ | |||
| defaults: | |||
| - override /group1@_global_: file2 | |||
| - override /group1@_global_.group1: file2 | |||
There was a problem hiding this comment.
Instead of this, can you add a global header to the file?
Experiment configs have it but this does not.
A package override in the defaults list is relative to the package of a config.
Jasha10
commented
Aug 26, 2021
Comment on lines
+1328
to
+1329
| You must specify 'db@_global_', e.g, db@_global_=<OPTION> | ||
| Available options:""" |
There was a problem hiding this comment.
Rebased to incorporate changes from PR #1783 so that this test would pass.
omry
approved these changes
Aug 31, 2021
Comment on lines
715
to
735
| param( | ||
| "two_group_defaults_different_pkgs_global", | ||
| [], | ||
| [ | ||
| ResultDefault( | ||
| config_path="group1/file1", | ||
| parent="two_group_defaults_different_pkgs_global", | ||
| package="group1", | ||
| ), | ||
| ResultDefault( | ||
| config_path="group1/file2", | ||
| parent="two_group_defaults_different_pkgs_global", | ||
| package="", | ||
| ), | ||
| ResultDefault( | ||
| config_path="two_group_defaults_different_pkgs_global", | ||
| package="", | ||
| is_self=True, | ||
| ), | ||
| ], | ||
| ), |
| parent="group_default_at_global", | ||
| ), | ||
| ], | ||
| id="include_absolute_config:override_with_global_default2", |
There was a problem hiding this comment.
copy paste id? include_absolute_config does not make sense to me.
There was a problem hiding this comment.
Yes. Updated in 806eb0b.
|
This PR also closed #1803 |
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 PR closes #1784 by modifying the
InputDefaults.get_override_keymethod.Changes Introduced
Previously,
get_override_keyhad this behavior:"foo"and package"foo"->override key == "foo""foo"and package"bar"->override key == "foo@bar""foo"and package""->override key == "foo"With this PR,
get_override_keyhas this behavior:"foo"and package"foo"->override key == "foo""foo"and package"bar"->override key == "foo@bar""foo"and package""->override key == "foo@_global_"Updates to Pre-Existing Tests
This PR introduces some new tests, and it also updates two old tests that were relying on the old key-collision behavior.
These two tests had to be updated:
In the first updated tests, the command-line override
"group1/group2=file2"was being used, while"group1/group2@_global_=file2"should have been used instead.In the second updated test, the default element
override /group1@_global_: file2was being used to override group"group1"at package"group1", while the elementoverride /group1@_global_.group1: file2should have been used instead.