test: revert TestComposeRunWithServicePorts and TestComposeRunWithPublish to legacy framework

These two tests run a long-lived nginx container that the test needs to
poll over HTTP. The nerdtest cmd.Background() + EnsureContainerStarted
pattern was failing in rootless mode: the backgrounded compose run's
stderr is captured into a pty buffer that nothing reads, so when the
inner `nerdctl run -d` fails (likely due to host port 8080 conflict),
the error is invisible and EnsureContainerStarted just times out with a
misleading "Command should succeed" assertion.

Restoring the pre-refactor testutil.NewBase + goroutine + HTTP probe
pattern for these two tests only. The other tests in the file run quick,
exiting commands and keep using nerdtest.

Signed-off-by: sathiraumesh <sathiraumesh@gmail.com>

Author: sathiraumesh

cmd/nerdctl/compose/compose_run_linux_test.go

@@ -21,6 +21,7 @@ import (
 	"io"
 	"strings"
 	"testing"
+	"time"
 
 	"gotest.tools/v3/assert"
 
@@ -118,101 +119,123 @@ services:
 }
 
 func TestComposeRunWithServicePorts(t *testing.T) {
-	testCase := nerdtest.Setup()
+	base := testutil.NewBase(t)
+	// specify the name of container in order to remove
+	// TODO: when `compose rm` is implemented, replace it.
+	containerName := testutil.Identifier(t)
 
-	testCase.Setup = func(data test.Data, helpers test.Helpers) {
-		dockerComposeYAML := fmt.Sprintf(`
+	dockerComposeYAML := fmt.Sprintf(`
 services:
   web:
     image: %s
     ports:
       - 8080:80
 `, testutil.NginxAlpineImage)
 
-		data.Temp().Save(dockerComposeYAML, "compose.yaml")
-		data.Labels().Set("composeYAML", data.Temp().Path("compose.yaml"))
-		cmd := helpers.Command(
-			"compose",
-			"-f",
-			data.Temp().Path("compose.yaml"),
-			"run",
-			"--service-ports",
-			"--name",
-			data.Identifier(),
-			"web",
-		)
-		cmd.WithPseudoTTY()
-		cmd.Background()
-		nerdtest.EnsureContainerStarted(helpers, data.Identifier())
-	}
+	comp := testutil.NewComposeDir(t, dockerComposeYAML)
+	defer comp.CleanUp()
+	projectName := comp.ProjectName()
+	t.Logf("projectName=%q", projectName)
+	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").Run()
 
-	testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
-		if yaml := data.Labels().Get("composeYAML"); yaml != "" {
-			helpers.Anyhow("compose", "-f", yaml, "down", "-v")
+	defer base.Cmd("rm", "-f", "-v", containerName).Run()
+	go func() {
+		// unbuffer(1) emulates tty, which is required by `nerdctl run -t`.
+		// unbuffer(1) can be installed with `apt-get install expect`.
+		unbuffer := []string{"unbuffer"}
+		base.ComposeCmdWithHelper(unbuffer, "-f", comp.YAMLFullPath(),
+			"run", "--service-ports", "--name", containerName, "web").Run()
+	}()
+
+	checkNginx := func() error {
+		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
+		if err != nil {
+			return err
+		}
+		respBody, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
+		if !strings.Contains(string(respBody), testutil.NginxAlpineIndexHTMLSnippet) {
+			t.Logf("respBody=%q", respBody)
+			return fmt.Errorf("respBody does not contain %q", testutil.NginxAlpineIndexHTMLSnippet)
 		}
+		return nil
 	}
-
-	testCase.Expected = func(data test.Data, helpers test.Helpers) *test.Expected {
-		return &test.Expected{
-			Output: func(stdout string, t tig.T) {
-				resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 30, false)
-				assert.NilError(t, err)
-				respBody, err := io.ReadAll(resp.Body)
-				assert.NilError(t, err)
-				assert.Assert(t, strings.Contains(string(respBody), testutil.NginxAlpineIndexHTMLSnippet))
-			},
+	var nginxWorking bool
+	for i := 0; i < 30; i++ {
+		t.Logf("(retry %d)", i)
+		err := checkNginx()
+		if err == nil {
+			nginxWorking = true
+			break
 		}
+		t.Log(err)
+		time.Sleep(3 * time.Second)
 	}
-
-	testCase.Run(t)
+	if !nginxWorking {
+		t.Fatal("nginx is not working")
+	}
+	t.Log("nginx seems functional")
 }
 
 func TestComposeRunWithPublish(t *testing.T) {
-	testCase := nerdtest.Setup()
+	base := testutil.NewBase(t)
+	// specify the name of container in order to remove
+	// TODO: when `compose rm` is implemented, replace it.
+	containerName := testutil.Identifier(t)
 
-	testCase.Setup = func(data test.Data, helpers test.Helpers) {
-		dockerComposeYAML := fmt.Sprintf(`
+	dockerComposeYAML := fmt.Sprintf(`
 services:
   web:
     image: %s
 `, testutil.NginxAlpineImage)
 
-		data.Temp().Save(dockerComposeYAML, "compose.yaml")
-		data.Labels().Set("composeYAML", data.Temp().Path("compose.yaml"))
-		cmd := helpers.Command(
-			"compose",
-			"-f",
-			data.Temp().Path("compose.yaml"),
-			"run",
-			"--publish", "8080:80",
-			"--name",
-			data.Identifier(),
-			"web",
-		)
-		cmd.WithPseudoTTY()
-		cmd.Background()
-		nerdtest.EnsureContainerStarted(helpers, data.Identifier())
-	}
+	comp := testutil.NewComposeDir(t, dockerComposeYAML)
+	defer comp.CleanUp()
+	projectName := comp.ProjectName()
+	t.Logf("projectName=%q", projectName)
+	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").Run()
 
-	testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
-		if yaml := data.Labels().Get("composeYAML"); yaml != "" {
-			helpers.Anyhow("compose", "-f", yaml, "down", "-v")
+	defer base.Cmd("rm", "-f", "-v", containerName).Run()
+	go func() {
+		// unbuffer(1) emulates tty, which is required by `nerdctl run -t`.
+		// unbuffer(1) can be installed with `apt-get install expect`.
+		unbuffer := []string{"unbuffer"}
+		base.ComposeCmdWithHelper(unbuffer, "-f", comp.YAMLFullPath(),
+			"run", "--publish", "8080:80", "--name", containerName, "web").Run()
+	}()
+
+	checkNginx := func() error {
+		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
+		if err != nil {
+			return err
+		}
+		respBody, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return err
+		}
+		if !strings.Contains(string(respBody), testutil.NginxAlpineIndexHTMLSnippet) {
+			t.Logf("respBody=%q", respBody)
+			return fmt.Errorf("respBody does not contain %q", testutil.NginxAlpineIndexHTMLSnippet)
 		}
+		return nil
 	}
-
-	testCase.Expected = func(data test.Data, helpers test.Helpers) *test.Expected {
-		return &test.Expected{
-			Output: func(stdout string, t tig.T) {
-				resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 30, false)
-				assert.NilError(t, err)
-				respBody, err := io.ReadAll(resp.Body)
-				assert.NilError(t, err)
-				assert.Assert(t, strings.Contains(string(respBody), testutil.NginxAlpineIndexHTMLSnippet))
-			},
+	var nginxWorking bool
+	for i := 0; i < 30; i++ {
+		t.Logf("(retry %d)", i)
+		err := checkNginx()
+		if err == nil {
+			nginxWorking = true
+			break
 		}
+		t.Log(err)
+		time.Sleep(3 * time.Second)
 	}
-
-	testCase.Run(t)
+	if !nginxWorking {
+		t.Fatal("nginx is not working")
+	}
+	t.Log("nginx seems functional")
 }
 
 func TestComposeRunWithEnv(t *testing.T) {