github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove Windows special case in TestContainerdRestart

Browse Source 
Previously in the Windows shim, killing a task that has already exited
or a task that has not yet been started, yielded an ErrNotFound. We now
return nil, which is in line with how the linux runtime behaves, so remove
the special case we had in TestContainerdRestart for this.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
This commit is contained in:
Daniel Canter 2022-08-13 07:46:53 -07:00
parent 1f8db2467b
commit 0950447106
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
integration/restart_test.go
View File

@ -25,7 +25,6 @@ import (
"time"
"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/integration/images"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@ -143,25 +142,12 @@ func TestContainerdRestart(t *testing.T) {
require.NoError(t, err)
err = task.Kill(ctx, syscall.SIGKILL, containerd.WithKillAll)
if goruntime.GOOS != "windows" {
// NOTE: CRI-plugin setups watcher for each container and
// cleanups container when the watcher returns exit event.
// We just need to kill that sandbox and wait for exit
// event from waitCh. If the sandbox container exits,
// the state of sandbox must be NOT_READY.
require.NoError(t, err)
} else {
// NOTE(gabriel-samfira): On Windows, the "notready-sandbox" array
// only has a container in the ContainerState_CONTAINER_CREATED
// state and a container in the ContainerState_CONTAINER_EXITED state.
// Sending a Kill() to a task that has already exited, or to a task that
// was never started (which is the case here), will always return an
// ErrorNotFound (at least on Windows). Given that in this sanbox, there
// will never be a running task, after we recover from a containerd restart
// we can expect an ErrorNotFound here every time.
// The waitCh channel should already be closed at this point.
assert.True(t, errdefs.IsNotFound(err), err)
}
// NOTE: CRI-plugin setups watcher for each container and
// cleanups container when the watcher returns exit event.
// We just need to kill that sandbox and wait for exit
// event from waitCh. If the sandbox container exits,
// the state of sandbox must be NOT_READY.
require.NoError(t, err)
select {
case <-waitCh: