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

Merge pull request #10933 from dmcgowan/test-container-resilience

Browse Source 
Make TestContainerPids more resilient
This commit is contained in:
Fu Wei 2024-11-03 20:58:24 +00:00 committed by GitHub
commit 716445af3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
integration/client/container_test.go
View File

@ -33,6 +33,15 @@ import (
apievents "github.com/containerd/containerd/api/events"
"github.com/containerd/containerd/api/types/runc/options"
"github.com/containerd/continuity/fs"
"github.com/containerd/errdefs"
"github.com/containerd/go-runc"
"github.com/containerd/log/logtest"
"github.com/containerd/platforms"
"github.com/containerd/typeurl/v2"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/require"
. "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/core/images"
@ -42,14 +51,6 @@ import (
"github.com/containerd/containerd/v2/pkg/oci"
gogotypes "github.com/containerd/containerd/v2/pkg/protobuf/types"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/continuity/fs"
"github.com/containerd/errdefs"
"github.com/containerd/go-runc"
"github.com/containerd/log/logtest"
"github.com/containerd/platforms"
"github.com/containerd/typeurl/v2"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/stretchr/testify/require"
)
func empty() cio.Creator {
@ -571,6 +572,8 @@ func TestContainerPids(t *testing.T) {
t.Errorf("invalid task pid %d", taskPid)
}
tryUntil := time.Now().Add(time.Second)
checkPids := func() bool {
processes, err := task.Pids(ctx)
if err != nil {
t.Fatal(err)
@ -595,6 +598,14 @@ func TestContainerPids(t *testing.T) {
} else {
// 2 processes, 1 for sh and one for sleep
if l != 2 {
if l == 1 && time.Now().Before(tryUntil) {
// The subcommand may not have been started when the
// pids are requested. Retrying is a simple way to
// handle the race under normal conditions. A better
// but more complex solution would be first waiting
// for output from the subprocess to be seen.
return true
}
t.Errorf("expected 2 process but received %d", l)
}
}
@ -609,6 +620,13 @@ func TestContainerPids(t *testing.T) {
if !found {
t.Errorf("pid %d must be in %+v", taskPid, processes)
}
return false
}
for checkPids() {
time.Sleep(5 * time.Millisecond)
}
if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
select {
case s := <-statusC: