dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 01:21:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #53317 from arcusbuilds/fix-53267-windows-probe-timeout

Browse Source 
Fix flaky TestHealthCheckProcessKilled on Windows
This commit is contained in:
Sebastiaan van Stijn
2026-08-07 02:23:13 +02:00
committed by GitHub
parent e707ca3cb3 104cdd47a6
commit d6944e5ebb
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
integration/container/health_test.go
View File

@@ -100,15 +100,24 @@ func TestHealthCheckProcessKilled(t *testing.T) {
ctx := setupTest(t)
apiClient := testEnv.APIClient()
// Note: Windows is much slower than Linux at getting the probe process to
// the point where it has written to stdout. With a 50ms timeout the probe
// is regularly killed before it has written anything, leaving the timeout
// message with no output to report.
probeTimeout := 50 * time.Millisecond
if testEnv.DaemonInfo.OSType == "windows" {
probeTimeout = 500 * time.Millisecond
}
cID := container.Run(ctx, t, apiClient, func(c *container.TestContainerConfig) {
c.Config.Healthcheck = &containertypes.HealthConfig{
Test: []string{"CMD", "sh", "-c", `echo "logs1 logs2 logs3"; sleep 60`},
Interval: 100 * time.Millisecond,
Timeout: 50 * time.Millisecond,
Timeout: probeTimeout,
Retries: 1,
}
})
poll.WaitOn(t, pollForHealthCheckLog(ctx, apiClient, cID, "Health check exceeded timeout (50ms): logs1 logs2 logs3\n"))
poll.WaitOn(t, pollForHealthCheckLog(ctx, apiClient, cID, fmt.Sprintf("Health check exceeded timeout (%v): logs1 logs2 logs3\n", probeTimeout)))
}
func TestHealthStartInterval(t *testing.T) {