CI: update tests to be more resilient against CLI output format and for libnetwork changes#42050
Merged
Conversation
thaJeztah
added
status/2-code-review
area/networking
5 tasks
Member
Author
|
@AkihiroSuda this one LGTY? (you LGTM'd #41908 some time back, which also had these changes) |
thaJeztah
commented
Mar 18, 2021
Comment on lines
164
to
165
Member
Author
There was a problem hiding this comment.
Discussing with @tonistiigi - making this slightly more strict (only replace first [ and ] before port number
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Rootlesskit doesn't currently handle IPv6 addresses, causing TestNetworkLoopbackNat
and TestNetworkNat to fail;
Error starting userland proxy:
error while calling PortManager.AddPort(): listen tcp: address :::8080: too many colons in address
This patch:
- Updates `getExternalAddress()` to pick IPv4 address if both IPv6 and IPv4 are found
- Update TestNetworkNat to net.JoinHostPort(), so that square brackets are used for
IPv6 addresses (e.g. `[::]:8080`)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Also re-formatting some lines for readability. Signed-off-by: Sebastiaan van Stijn <[email protected]>
tonistiigi
approved these changes
Mar 22, 2021
tiborvass
approved these changes
Mar 24, 2021
5 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
relates to / in preparation of #41908 ("vendor: docker/libnetwork b3507428be5b458cb0e2b4086b13531fb0706e46")
integration/container: wrap some long lines for readability
Just some minor code-style changes for readability
integration: update getExternalAddress to prefer IPv4
Rootlesskit doesn't currently handle IPv6 addresses, causing TestNetworkLoopbackNat and TestNetworkNat to fail;
This patch:
getExternalAddress()to pick IPv4 address if both IPv6 and IPv4 are found[::]:8080)integration-cli: rely less on "docker port" output format
Also re-formatting some lines for readability.