Skip to content

Conversation

@kolyshkin
Copy link
Contributor

Please see individual commits for details. Nothing major but nice to have.

AkihiroSuda
AkihiroSuda previously approved these changes May 5, 2021
kolyshkin added 4 commits May 6, 2021 12:36
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>
Otherwise showFile log statements show its own file/line info,
rather than that of the caller's.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
os.FindProcess never returns an error on Unix/Linux.
Use kill(0) to actually check if the process exists.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
Copy link
Contributor Author

Rebased to include #2941 to fix CI failures

@kolyshkin kolyshkin requested a review from AkihiroSuda May 7, 2021 16:59
@haircommander
Copy link
Contributor

LGTM

@mrunalp mrunalp merged commit 5c4ccc2 into opencontainers:master May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants