Fix config.go by skipping them

Signed-off-by: Amir Mohamad Ehsandar <[email protected]>
opencontainers · Oct 15, 2020 · fe1e7bd · fe1e7bd
1 parent dbd98fc
commit fe1e7bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/libcontainer/configs/config.go b/libcontainer/configs/config.go
@@ -385,8 +385,8 @@ func (c Command) Run(s *specs.State) error {
 	case err := <-errC:
 		return err
 	case <-timerCh:
-		cmd.Process.Kill()
-		cmd.Wait()
+		_ = cmd.Process.Kill()
+		_ = cmd.Wait()
 		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
@@ -149,7 +149,10 @@ func TestFuncHookRun(t *testing.T) {
 		return nil
 	})
 
-	fHook.Run(state)
+	err := fHook.Run(state)
+	if err != nil {
+		t.Errorf("Unexpected error running hook: %+v", err)
+	}
 }
 
 func TestCommandHookRun(t *testing.T) {
@@ -184,7 +187,7 @@ func TestCommandHookRunTimeout(t *testing.T) {
 		Pid:     1,
 		Bundle:  "/bundle",
 	}
-	timeout := (10 * time.Millisecond)
+	timeout := 10 * time.Millisecond
 
 	cmdHook := configs.NewCommandHook(configs.Command{
 		Path:    os.Args[0],