tests: Fix pytest container networking issues #1856
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 original `/.dockerenv` approach is no longer valid, and context wise we're only using this for the test suite, so using an ENV in that container is a better solution.
DRY and clearer that we're referring to the pytest container.
When the container runs with host networking instead of the default bridge, the `$HOSTNAME` / `/etc/hostname` reflects that of the host instead of the container ID , which causes the pytest container to get removed accidentally. Using a container name instead we can more reliably target the container to avoid removing it, should we need to run with host networking instead.
This is not compatible or required, since host networking is no longer isolated to container networks only.
The `network` object would never be in a list of network names (strings), and without `greedy=True` arg as the `docker-py` API docs note, the containers will not be part of the results, thus always returning an empty list which was not intended.. Now the network will properly match the current networks for pytest container, avoiding duplicate connect attempts, and the network list result will actually have containers to count when filtering by length.
A test on raw IP addresses doesn't reach the existing IPv6 skip logic, added that to avoid a test failing when only IPv4 is available (eg: standard docker container networks). Additionally some other tests set the `none` network and connecting to this fails as it's not allowed? Preventing that from happening resolves the final failing tests within containerized pytest.
Noticed some trailing white-space. Removed for consistency with the rest of the file.
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 contributes fixes I described here when investigating test failures from running pytest via the supported Docker container method (my preference).
I've scoped changes out to individual commits as usual, with commit messages adding context. The final commit does a little housekeeping with white-space so it might be a cleaner diff if you disable white-space when viewing.
Roughly the changes are:
pytestvia container (pytest.sh) by using ENV instead of the deprecated internal file check that Docker no longer supports. We only need it for running tests and control thepytestDockerfile, seems the right way to approach it 馃憤$HOSTNAME//etc/hostname, not the containers ID, thus thepytestcontainer would accidentally remove itself. We now match by setting a container name inpytest.shto compare against instead.pytestcontainer should connect to other container networks (specifically thenginx-proxyone, typically a bridge network with name based on the docker-compose file name). This wasn't happening because of a missing arg to request networks with their associated containers, and once that was corrected, several other parts were found to not be working properly, such as avoiding connecting to a network that was already connected, or avoidingnonenetwork (different from passingNone).Behaviour of the
pytestcontainer is now at parity with running it locally on the host.Fixes #1615