Only parse global args once #1802
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
This checks for actual emptiness, while `""` means "don't care". Signed-off-by: Ian Campbell <[email protected]>
simonferquel
approved these changes
Apr 3, 2019
|
Yep. I'll investigate the CI failures after lunch, looks like I regressed something... |
|
Adding I'll sort it shortly. |
added 4 commits
April 3, 2019 15:06
This was omitted when these tests were added.
Adding this means that the tests now see the `$DOCKER_HOST` configured (via
`$TEST_DOCKER_HOST`) where they didn't before. In some cases (specifically the
`test-e2e-connhelper-ssh` case) this results in additional output on stderr
when `-D` (debug) is used:
time="2019-04-03T11:10:27Z" level=debug msg="commandconn: starting ssh with [-l penguin 172.20.0.2 -- docker system dial-stdio]"
Address this by switching the affected test cases to use `-l info` instead of
`-D`, they all just require some option not specifically `-D`. Note that `info`
is the default log level so this is effectively a nop (which is good).
Signed-off-by: Ian Campbell <[email protected]>
These currently fail. Signed-off-by: Ian Campbell <[email protected]>
Before calling `cmd.Execute` we need to reset the arguments to be used to not include the global arguments which we have already parsed. This is precisely the `args` which we have in our hand at this point. This fixes `TestGlobalArgsOnlyParsedOnce/builtin` in the cli-plugins e2e tests. `TestGlobalArgsOnlyParsedOnce/plugin` is still broken will be fixed next. Signed-off-by: Ian Campbell <[email protected]>
This fixes `TestGlobalArgsOnlyParsedOnce/plugin` in the cli-plugins e2e tests. Signed-off-by: Ian Campbell <[email protected]>
ijc
force-pushed
the
only-parse-global-args-once
branch
from
c2453a6
to
1425aeb
Compare
Codecov Report
@@ Coverage Diff @@
## master #1802 +/- ##
=========================================
Coverage ? 56.28%
=========================================
Files ? 308
Lines ? 21300
Branches ? 0
=========================================
Hits ? 11988
Misses ? 8437
Partials ? 875 |
|
I pushed an update to fix the CI. The change was in |
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.
- What I did
Fixed #1801 by ensuring the monolithic CLI and plugins themselves only parse their global arguments once. Along the way I noticed that the cli-plugins e2e tests lacked a
TestMain(and thus a call toenvironment.Setup) and fixed that as well as tightening the checks on a couple of existing tests.Fixes #1801.
- How I did it
After parsing the global args (which we do manually due to #1722) reset the cmd's args to only the remaining ones.
- How to verify it
New e2e tests
TestGlobalArgsOnlyParsedOnce/*validate this, existing tests should cover the rest.- Description for the changelog
N/A (haven't released the bug yet)