adding process.Kill() to tests

Signed-off-by: CodeChanning <[email protected]>

Author: CodeChanning

cmd/nerdctl/container_run_linux_test.go

@@ -329,17 +329,21 @@ func runSigProxy(t *testing.T, args ...string) (string, bool, bool) {
 		testutil.SigProxyTestScript,
 	)
 
-	process := base.Cmd(fullArgs...).Start()
+	result := base.Cmd(fullArgs...).Start()
+	process := result.Cmd.Process
 
-	// This sleep waits for until we reach the trap command in the shell script, if sigint is send before that we dont enter the while loop.
+	// Waits until we reach the trap command in the shell script, then sends SIGINT.
 	time.Sleep(3 * time.Second)
-	syscall.Kill(process.Cmd.Process.Pid, syscall.SIGINT)
+	syscall.Kill(process.Pid, syscall.SIGINT)
 
-	//define wait delay to avoid timeout
-	process.Cmd.WaitDelay = 3 * time.Second
-	process.Cmd.Wait()
+	// Waits until SIGINT is sent and responded to, then kills process to avoid timeout
+	time.Sleep(3 * time.Second)
+	process.Kill()
+
+	sigIntRecieved := strings.Contains(result.Stdout(), testutil.SigProxyTrueOut)
+	timedOut := strings.Contains(result.Stdout(), testutil.SigProxyTimeoutMsg)
 
-	return process.Stdout(), strings.Contains(process.Stdout(), testutil.SigProxyTrueOut), strings.Contains(process.Stdout(), testutil.SigProxyTimeoutMsg)
+	return result.Stdout(), sigIntRecieved, timedOut
 }
 
 func TestRunSigProxy(t *testing.T) {

pkg/testutil/testutil_linux.go

@@ -58,7 +58,7 @@ var (
 	ExpectedConnectionRefusedError = "connection refused"
 
 	SigProxyTrueOut    = "received SIGINT"
-	SigProxyTimeoutMsg = "Timed Out; No SIGINT received"
+	SigProxyTimeoutMsg = "Timed Out; No signal received"
 	SigProxyTestScript = `#!/bin/sh
 	set -eu