Adapt nerdtest to updated tigron

- Background() signature change
- command creation change

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

Author: apostasie

pkg/testutil/nerdtest/command.go

@@ -21,7 +21,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"testing"
-	"time"
 
 	"gotest.tools/v3/assert"
 
@@ -78,7 +77,10 @@ func newNerdCommand(conf test.Config, t *testing.T) *nerdCommand {
 	}
 
 	// Create the base command, with the right binary, t
-	ret := &nerdCommand{}
+	ret := &nerdCommand{
+		GenericCommand: *(test.NewGenericCommand().(*test.GenericCommand)),
+	}
+
 	ret.WithBinary(binary)
 	// Not interested in these - and insulate us from parent environment side effects
 	ret.WithBlacklist([]string{
@@ -113,9 +115,9 @@ func (nc *nerdCommand) Run(expect *test.Expected) {
 	nc.GenericCommand.Run(expect)
 }
 
-func (nc *nerdCommand) Background(timeout time.Duration) {
+func (nc *nerdCommand) Background() {
 	nc.prep()
-	nc.GenericCommand.Background(timeout)
+	nc.GenericCommand.Background()
 }
 
 // Run does override the generic command run, as we are testing both docker and nerdctl

pkg/testutil/nerdtest/utilities_linux.go

@@ -47,15 +47,18 @@ func RunSigProxyContainer(signal os.Signal, exitOnSignal bool, args []string, da
 	trap sig_msg ` + sig + `
 	printf "` + ready + `\n"
 	while true; do
-		sleep 0.1
+		printf "waiting...\n"
+		sleep 0.5
 	done
 `
 
 	args = append(args, "--name", data.Identifier(), testutil.CommonImage, "sh", "-c", script)
 	args = append([]string{"run"}, args...)
 
 	cmd := helpers.Command(args...)
-	cmd.Background(10 * time.Second)
+	// NOTE: because of a test like TestStopWithStopSignal, we need to wait enough for nerdctl to terminate the container
+	cmd.WithTimeout(20 * time.Second)
+	cmd.Background()
 	EnsureContainerStarted(helpers, data.Identifier())
 
 	for {