Fix/remove broken integration-cli IPv6 tests #47788
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 test hadn't been running, because it used testRequires(c, IPv6)
and predicate "IPv6" returns the opposite of the expected result.
If the test had run, it'd have failed because:
- it used "--listen-add", but the option is "--listen-addr"
- so, the daemon wouldn't have started
- it tried to use "--join ::1"
- address "::1" was interpreted as host:port so the Dial() failed,
it needed to be "[::1]".
- it didn't supply a join token
Signed-off-by: Rob Murray <rob.murray@docker.com>
The test hadn't been running, because it used testRequires(c, IPv6) and predicate "IPv6" returns the opposite of the expected result. TestDaemonIPv6Enabled tried to run with IPv6 on the default bridge, but didn't set up a "fixed-cidr-v6" - so the daemon wouldn't start. It then tried to check the bridge had address "fe80::1", which it expected to work because it had just used setupV6() to add that address. Then it checked that "LinkLocalIPv6Address" was set in container inspect output, but it wouldn't be (the field is deprecated). There are working IPv6 tests in the suite (TestDaemonIPv6FixedCIDR, TestDaemonIPv6FixedCIDRAndMac, TestDaemonIPv6HostMode) - and there's more coverage in the network integration tests. So, deleted the test as it didn't seem worth salvaging. Also deleted now-unused helper functions setupV6(), teardownV6(). Signed-off-by: Rob Murray <rob.murray@docker.com>
It'd only return true on a host with no IPv6 in its kernel. So, removed, having fixed the two tests that used it. Signed-off-by: Rob Murray <rob.murray@docker.com>
robmry
added
area/cli
status/2-code-review
area/networking
area/testing
kind/bugfix
akerouanton
reviewed
May 7, 2024
corhere
approved these changes
May 8, 2024
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
Found two
integration-clitests that didn't run, because the "requires IPv6" test they used was wrong (it'd only return true on a host with no IPv6), and sorted that out.- How I did it
Fixed one test, deleted the other, deleted associated/broken helper functions - see the individual commit messages.
- How to verify it
It's tests.
- Description for the changelog