integration: fix TestContainerPids

Kazuyoshi Kato · Kazuyoshi Kato · commit acb81bbdaf35 · 2021-08-19T09:56:22.000-07:00
task.Pids returns the task's processes, but the order is not guaranteed.

Signed-off-by: Kazuyoshi Kato &lt;katokazu@amazon.com&gt;
diff --git a/integration/client/container_test.go b/integration/client/container_test.go
@@ -443,9 +443,9 @@ func TestContainerPids(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	pid := task.Pid()
-	if pid < 1 {
-		t.Errorf("invalid task pid %d", pid)
+	taskPid := task.Pid()
+	if taskPid < 1 {
+		t.Errorf("invalid task pid %d", taskPid)
 	}
 	processes, err := task.Pids(ctx)
 	switch runtime.GOOS {
@@ -459,12 +459,17 @@ func TestContainerPids(t *testing.T) {
 		if l := len(processes); l != 2 {
 			t.Errorf("expected 2 process but received %d", l)
 		}
-		if len(processes) > 0 {
-			actual := processes[0].Pid
-			if pid != actual {
-				t.Errorf("expected pid %d but received %d. processes = %+v", pid, actual, processes)
+
+		var found bool
+		for _, p := range 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 {
 		select {

Original file line number	Diff line number	Diff line change
`@@ -443,9 +443,9 @@ func TestContainerPids(t *testing.T) {`
`443`	`443`	`t.Fatal(err)`
`444`	`444`	`}`
`445`	`445`
`446`		`- pid := task.Pid()`
`447`		`- if pid < 1 {`
`448`		`- t.Errorf("invalid task pid %d", pid)`
	`446`	`+ taskPid := task.Pid()`
	`447`	`+ if taskPid < 1 {`
	`448`	`+ t.Errorf("invalid task pid %d", taskPid)`
`449`	`449`	`}`
`450`	`450`	`processes, err := task.Pids(ctx)`
`451`	`451`	`switch runtime.GOOS {`
`@@ -459,12 +459,17 @@ func TestContainerPids(t *testing.T) {`
`459`	`459`	`if l := len(processes); l != 2 {`
`460`	`460`	`t.Errorf("expected 2 process but received %d", l)`
`461`	`461`	`}`
`462`		`- if len(processes) > 0 {`
`463`		`- actual := processes[0].Pid`
`464`		`- if pid != actual {`
`465`		`- t.Errorf("expected pid %d but received %d. processes = %+v", pid, actual, processes)`
	`462`	`+`
	`463`	`+ var found bool`
	`464`	`+ for _, p := range processes {`
	`465`	`+ if p.Pid == taskPid {`
	`466`	`+ found = true`
	`467`	`+ break`
`466`	`468`	`}`
`467`	`469`	`}`
	`470`	`+ if !found {`
	`471`	`+ t.Errorf("pid %d must be in %+v", taskPid, processes)`
	`472`	`+ }`
`468`	`473`	`}`
`469`	`474`	`if err := task.Kill(ctx, syscall.SIGKILL); err != nil {`
`470`	`475`	`select {`