From bcca79684827cb7603204165731e004be90a448e Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 5 May 2021 11:30:22 -0700 Subject: [PATCH] libct/int: simplify/fix showing errors Instead of manually figuring out the file and line number of the caller, use t.Helper() so t.Fatal prints the correct one. Before: > utils_test.go:85: exec_test.go:536: unexpected error: container_linux.go:380: starting container process caused: exec: "catt": executable file not found in $PATH After: > exec_test.go:536: unexpected error: container_linux.go:380: starting container process caused: exec: "catt": executable file not found in $PATH (the error is introduced by s/cat/catt/) Signed-off-by: Kir Kolyshkin --- libcontainer/integration/utils_test.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libcontainer/integration/utils_test.go b/libcontainer/integration/utils_test.go index 74bd7e073..75203d6f5 100644 --- 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) } }