Skip to content

[27.x backport] integration: add wait#48969

Merged
thaJeztah merged 1 commit intomoby:27.xfrom
thaJeztah:27.x_backport_integration_add_wait
Nov 27, 2024
Merged

[27.x backport] integration: add wait#48969
thaJeztah merged 1 commit intomoby:27.xfrom
thaJeztah:27.x_backport_integration_add_wait

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Cherry-picked several WIP commits from
https://github.com/moby/moby/commits/b0a592798f4d9d7162f8aedca89ada3a29d60e2c/

Originally-authored-by: Rodrigo Campos <[email protected]>
Co-Authored-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit fb6e650)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Comment on lines -1092 to +1102
resp, err := http.Get("http://[::1]:" + hostPort)
assert.NilError(t, err)
var resp *http.Response
addr := "http://[::1]:" + hostPort
poll.WaitOn(t, func(t poll.LogT) poll.Result {
var err error
resp, err = http.Get(addr) // #nosec G107 -- Ignore "Potential HTTP request made with variable url"
if err != nil {
return poll.Continue("waiting for %s to be accessible: %v", addr, err)
}
return poll.Success()
})
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part didn't apply clean because TestProxy4To6 moved to a different file in master, so I just copy/pasta'd the change to the right file in this branch.

@robmry
Copy link
Copy Markdown
Contributor

robmry commented Nov 27, 2024

Unrelated test failure ...

=== FAIL: amd64.integration.container TestWaitBlocked/test-wait-blocked-exit-zero (10.39s)
    wait_test.go:97: assertion failed: 0 (tc.expectedCode int64) != 137 (waitRes.StatusCode int64)
    --- FAIL: TestWaitBlocked/test-wait-blocked-exit-zero (10.39s)

@thaJeztah thaJeztah merged commit b9fd5ee into moby:27.x Nov 27, 2024
@thaJeztah thaJeztah deleted the 27.x_backport_integration_add_wait branch November 27, 2024 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants