From 7e7ff8722add9399dab2b3694ca14ff33fb475c2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 1 Feb 2021 19:32:45 +0100 Subject: [PATCH] errcheck: libcontainer/configs Signed-off-by: Sebastiaan van Stijn --- libcontainer/configs/config.go | 2 +- libcontainer/configs/config_test.go | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libcontainer/configs/config.go b/libcontainer/configs/config.go index 14a096038..c6b259e9f 100644 --- a/libcontainer/configs/config.go +++ b/libcontainer/configs/config.go @@ -387,7 +387,7 @@ func (c Command) Run(s *specs.State) error { case err := <-errC: return err case <-timerCh: - cmd.Process.Kill() + _ = cmd.Process.Kill() <-errC return fmt.Errorf("hook ran past specified timeout of %.1fs", c.Timeout.Seconds()) } diff --git a/libcontainer/configs/config_test.go b/libcontainer/configs/config_test.go index 97286740f..a270f3780 100644 --- a/libcontainer/configs/config_test.go +++ b/libcontainer/configs/config_test.go @@ -145,12 +145,15 @@ func TestFuncHookRun(t *testing.T) { fHook := configs.NewFunctionHook(func(s *specs.State) error { if !reflect.DeepEqual(state, s) { - t.Errorf("Expected state %+v to equal %+v", state, s) + return fmt.Errorf("expected state %+v to equal %+v", state, s) } return nil }) - fHook.Run(state) + err := fHook.Run(state) + if err != nil { + t.Fatal(err) + } } func TestCommandHookRun(t *testing.T) {