0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #45391 from vvoland/windows-flaky-testkillcontainer

Browse source 
integration/TestKillContainer: Bigger timeout on Windows
This commit is contained in:
Sebastiaan van Stijn 2023-04-26 17:02:31 +02:00 • committed by GitHub
commit 489543cd25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration/container/kill_test.go
View file

@ -2,6 +2,7 @@ package container // import "github.com/docker/docker/integration/container"
import (
"context"
"runtime"
"testing"
"time"
@ -61,6 +62,11 @@ func TestKillContainer(t *testing.T) {
},
}
var pollOpts []poll.SettingOp
if runtime.GOOS == "windows" {
pollOpts = append(pollOpts, poll.WithTimeout(StopContainerWindowsPollTimeout))
}
for _, tc := range testCases {
tc := tc
t.Run(tc.doc, func(t *testing.T) {
@ -70,7 +76,7 @@ func TestKillContainer(t *testing.T) {
err := client.ContainerKill(ctx, id, tc.signal)
assert.NilError(t, err)
poll.WaitOn(t, container.IsInState(ctx, client, id, tc.status), poll.WithDelay(100*time.Millisecond))
poll.WaitOn(t, container.IsInState(ctx, client, id, tc.status), pollOpts...)
})
}
}