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

Merge pull request #46179 from vvoland/windows-unskip-kill-tests-24

Browse source 
[24.0 backport] integration/windows: Unskip some kill tests
This commit is contained in:
Sebastiaan van Stijn 2023-08-09 18:12:08 +02:00 committed by GitHub
commit c370341900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
integration/container/kill_test.go
View file

@ -82,7 +82,6 @@ func TestKillContainer(t *testing.T) {
}
func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
skip.If(t, testEnv.OSType == "windows", "Windows only supports 1.25 or later")
defer setupTest(t)()
client := testEnv.APIClient()
@ -103,6 +102,11 @@ func TestKillWithStopSignalAndRestartPolicies(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) {
@ -115,13 +119,12 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
err := client.ContainerKill(ctx, id, "TERM")
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...)
})
}
}
func TestKillStoppedContainer(t *testing.T) {
skip.If(t, testEnv.OSType == "windows", "Windows only supports 1.25 or later")
defer setupTest(t)()
ctx := context.Background()
client := testEnv.APIClient()