e2e: ensure all Compose cmds standalone compatible #9567
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
The E2E tests can be run in plugin (`docker compose`) or standalone (`docker-compose`) mode. Existing logic was in place to ensure that the helper method is always used, which will invoke the right one based on how tests are being executed. However, this logic was too easy to (unintentionally) bypass given the myriad of ways that commands can be run. The check has been made stricter and pushed to a lower-level to more aggressively catch instances. As a result, a bunch of calls to `RunDockerCmd` are now updated to be `RunDockerComposeCmd`, which will ensure that the invocation is correct based on test mode. Signed-off-by: Milas Bowman <milas.bowman@docker.com>
This was using `docker exec` on Compose containers instead of `docker compose exec` (and `docker-compose exec` for standalone). Thanks to @glours for catching! Signed-off-by: Milas Bowman <milas.bowman@docker.com>
glours
approved these changes
Jun 16, 2022
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
The E2E tests can be run in plugin (
docker compose) or standalone(
docker-compose) mode. Existing logic was in place to ensure thatthe helper method is always used, which will invoke the right one
based on how tests are being executed.
However, this logic was too easy to (unintentionally) bypass given
the myriad of ways that commands can be run. The check has been
made stricter and pushed to a lower-level to more aggressively
catch instances.
As a result, a bunch of calls to
RunDockerCmdare now updatedto be
RunDockerComposeCmd, which will ensure that the invocationis correct based on test mode.
(not mandatory) A picture of a cute animal, if possible in relation with what you did
