mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

libct/int: simplify/fix showing errors

Browse Source 
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 <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2021-05-05 11:30:22 -07:00
parent ee36ccf591
commit bcca796848
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcontainer/integration/utils_test.go
+5 -6
View File
@@ -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)
}
}