integration: TestPingSwarmHeader(): fix incorrect ping, and cleanup #43658
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
I noticed I made a mistake in the first ping ("before swarm init"), which
was not specifying the daemon's socket path and because of that testing
against the main integration daemon (not the locally spun up daemon).
While fixing that, I wondered why the test didn't actually use the client
for the requests (to also verify the client converted the response), so
I rewrote the test to use `client.Ping()` and to verify the ping response
has the expected values set.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
added
area/api
area/testing
kind/bugfix
|
Windows failure is unrelated, and a known flaky test; (I'll kick CI again) |
rumpl
approved these changes
May 30, 2022
|
Thx for reviewing! Let me bring this one in (it's a test-only change, so no risk w.r.t. production code); this header was added for the 22.06 release, so I'd like to have the related test fixed for that 😄 |
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.
While working on #43657, I noticed I made a mistake in the first ping ("before swarm init"), which was not specifying the daemon's socket path and because of that testing against the main integration daemon (not the locally spun up daemon).
While fixing that, I wondered why the test didn't actually use the client for the requests (to also verify the client converted the response), so I rewrote the test to use
client.Ping()and to verify the ping response has the expected values set.make BIND_DIR=. TEST_FILTER=TestPingSwarmHeader DOCKER_GRAPHDRIVER=vfs test-integration ... === RUN TestPingSwarmHeader === RUN TestPingSwarmHeader/before_swarm_init === RUN TestPingSwarmHeader/after_swarm_init === RUN TestPingSwarmHeader/after_swarm_leave --- PASS: TestPingSwarmHeader (2.75s) --- PASS: TestPingSwarmHeader/before_swarm_init (0.00s) --- PASS: TestPingSwarmHeader/after_swarm_init (0.00s) --- PASS: TestPingSwarmHeader/after_swarm_leave (0.00s) PASS- A picture of a cute animal (not mandatory but encouraged)