Merge pull request #2938 from kolyshkin/libct-int-nts

Mrunal Patel · web-flow · commit 5c4ccc2f7290 · 2021-05-14T19:15:38.000-04:00
libcontainer/integration: nits
diff --git a/libcontainer/integration/checkpoint_test.go b/libcontainer/integration/checkpoint_test.go
@@ -11,9 +11,11 @@ import (
 	"testing"
 
 	"github.com/opencontainers/runc/libcontainer"
+	"golang.org/x/sys/unix"
 )
 
 func showFile(t *testing.T, fname string) error {
+	t.Helper()
 	t.Logf("=== %s ===\n", fname)
 
 	f, err := os.Open(fname)
@@ -188,19 +190,14 @@ func testCheckpoint(t *testing.T, userns bool) {
 	pid, err = restoreProcessConfig.Pid()
 	ok(t, err)
 
-	_, err = os.FindProcess(pid)
+	err = unix.Kill(pid, 0)
 	ok(t, err)
 
 	_, err = restoreStdinW.WriteString("Hello!")
 	ok(t, err)
 
 	restoreStdinW.Close()
-	s, err := restoreProcessConfig.Wait()
-	ok(t, err)
-
-	if !s.Success() {
-		t.Fatal(s.String(), pid)
-	}
+	waitProcess(restoreProcessConfig, t)
 
 	output := restoreStdout.String()
 	if !strings.Contains(output, "Hello!") {
diff --git a/libcontainer/integration/utils_test.go b/libcontainer/integration/utils_test.go
@@ -80,22 +80,21 @@ func (b *stdBuffers) String() string {
 
 // ok fails the test if an err is not nil.
 func ok(t testing.TB, err error) {
+	t.Helper()
 	if err != nil {
-		_, file, line, _ := runtime.Caller(1)
-		t.Fatalf("%s:%d: unexpected error: %s\n\n", filepath.Base(file), line, err.Error())
+		t.Fatalf("unexpected error: %v", err)
 	}
 }
 
 func waitProcess(p *libcontainer.Process, t *testing.T) {
-	_, file, line, _ := runtime.Caller(1)
+	t.Helper()
 	status, err := p.Wait()
-
 	if err != nil {
-		t.Fatalf("%s:%d: unexpected error: %s\n\n", filepath.Base(file), line, err.Error())
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	if !status.Success() {
-		t.Fatalf("%s:%d: unexpected status: %s\n\n", filepath.Base(file), line, status.String())
+		t.Fatalf("unexpected status: %v", status)
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -80,22 +80,21 @@ func (b *stdBuffers) String() string {`
`80`	`80`
`81`	`81`	`// ok fails the test if an err is not nil.`
`82`	`82`	`func ok(t testing.TB, err error) {`
	`83`	`+ t.Helper()`
`83`	`84`	`if err != nil {`
`84`		`- _, file, line, _ := runtime.Caller(1)`
`85`		`- t.Fatalf("%s:%d: unexpected error: %s\n\n", filepath.Base(file), line, err.Error())`
	`85`	`+ t.Fatalf("unexpected error: %v", err)`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`func waitProcess(p libcontainer.Process, t testing.T) {`
`90`		`- _, file, line, _ := runtime.Caller(1)`
	`90`	`+ t.Helper()`
`91`	`91`	`status, err := p.Wait()`
`92`		`-`
`93`	`92`	`if err != nil {`
`94`		`- t.Fatalf("%s:%d: unexpected error: %s\n\n", filepath.Base(file), line, err.Error())`
	`93`	`+ t.Fatalf("unexpected error: %v", err)`
`95`	`94`	`}`
`96`	`95`
`97`	`96`	`if !status.Success() {`
`98`		`- t.Fatalf("%s:%d: unexpected status: %s\n\n", filepath.Base(file), line, status.String())`
	`97`	`+ t.Fatalf("unexpected status: %v", status)`
`99`	`98`	`}`
`100`	`99`	`}`
`101`	`100`