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

Merge pull request #6390 from gabriel-samfira/fix-restart-container-test

Browse Source 
Fix restart container test
This commit is contained in:
Akihiro Suda 2021-12-24 18:29:57 +09:00 committed by GitHub
commit 1a078e6893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
integration/main_test.go
View File

@ -364,7 +364,7 @@ func Randomize(str string) string {
func KillProcess(name string) error { func KillProcess(name string) error {
var command []string var command []string
if goruntime.GOOS == "windows" { if goruntime.GOOS == "windows" {
command = []string{"tskill", strings.TrimSuffix(name, ".exe")} command = []string{"taskkill", "/IM", name, "/F"}
} else { } else {
command = []string{"pkill", "-x", fmt.Sprintf("^%s$", name)} command = []string{"pkill", "-x", fmt.Sprintf("^%s$", name)}
} }

17
integration/restart_test.go
View File

@ -24,6 +24,7 @@ import (
"time" "time"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"golang.org/x/net/context" "golang.org/x/net/context"
@ -139,12 +140,26 @@ func TestContainerdRestart(t *testing.T) {
waitCh, err := task.Wait(ctx) waitCh, err := task.Wait(ctx)
require.NoError(t, err) 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 // NOTE: CRI-plugin setups watcher for each container and
// cleanups container when the watcher returns exit event. // cleanups container when the watcher returns exit event.
// We just need to kill that sandbox and wait for exit // We just need to kill that sandbox and wait for exit
// event from waitCh. If the sandbox container exits, // event from waitCh. If the sandbox container exits,
// the state of sandbox must be NOT_READY. // the state of sandbox must be NOT_READY.
require.NoError(t, task.Kill(ctx, syscall.SIGKILL, containerd.WithKillAll)) 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)
}
select { select {
case <-waitCh: case <-waitCh: