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

Merge pull request #6369 from fuweid/fix_test_case

Browse Source 
integration: deflake TestContainerdRestart
This commit is contained in:
Mike Brown 2021-12-13 13:54:27 -06:00 committed by GitHub
commit d977f77a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
integration/restart_test.go
View File

@ -19,10 +19,11 @@ package integration
import ( import (
goruntime "runtime" goruntime "runtime"
"sort" "sort"
"syscall"
"testing" "testing"
"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"
@ -134,9 +135,21 @@ func TestContainerdRestart(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
task, err := cntr.Task(ctx, nil) task, err := cntr.Task(ctx, nil)
require.NoError(t, err) require.NoError(t, err)
_, err = task.Delete(ctx, containerd.WithProcessKill)
if err != nil { waitCh, err := task.Wait(ctx)
require.True(t, errdefs.IsNotFound(err), "delete should return not found error but returned %v", err) require.NoError(t, 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, task.Kill(ctx, syscall.SIGKILL, containerd.WithKillAll))
select {
case <-waitCh:
case <-time.After(30 * time.Second):
t.Fatalf("expected to receive exit event in time, but timeout")
} }
} }
} }