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

Merge pull request #5896 from kzys/pid-order

Browse Source 
integration: fix TestContainerPids
This commit is contained in:
Akihiro Suda 2021-08-20 13:36:26 +09:00 committed by GitHub
commit a6034d021f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
integration/client/container_test.go
View File

@ -443,9 +443,9 @@ func TestContainerPids(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
pid := task.Pid() taskPid := task.Pid()
if pid < 1 { if taskPid < 1 {
t.Errorf("invalid task pid %d", pid) t.Errorf("invalid task pid %d", taskPid)
} }
processes, err := task.Pids(ctx) processes, err := task.Pids(ctx)
switch runtime.GOOS { switch runtime.GOOS {
@ -459,12 +459,17 @@ func TestContainerPids(t *testing.T) {
if l := len(processes); l != 2 { if l := len(processes); l != 2 {
t.Errorf("expected 2 process but received %d", l) t.Errorf("expected 2 process but received %d", l)
} }
if len(processes) > 0 {
actual := processes[0].Pid var found bool
if pid != actual { for _, p := range processes {
t.Errorf("expected pid %d but received %d. processes = %+v", pid, actual, processes) if p.Pid == taskPid {
found = true
break
} }
} }
if !found {
t.Errorf("pid %d must be in %+v", taskPid, processes)
}
} }
if err := task.Kill(ctx, syscall.SIGKILL); err != nil { if err := task.Kill(ctx, syscall.SIGKILL); err != nil {
select { select {