Merge pull request #33 from coderbirju/add-details-network-inspect

Add details network inspect

Author: coderbirju

cmd/nerdctl/compose/compose_kill_linux_test.go

@@ -18,15 +18,23 @@ package compose
 
 import (
 	"fmt"
+	"path/filepath"
+	"regexp"
 	"testing"
-	"time"
 
+	"github.com/containerd/nerdctl/mod/tigron/expect"
+	"github.com/containerd/nerdctl/mod/tigron/test"
+
+	"github.com/containerd/nerdctl/v2/pkg/composer/serviceparser"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
+	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
 )
 
 func TestComposeKill(t *testing.T) {
-	base := testutil.NewBase(t)
-	var dockerComposeYAML = fmt.Sprintf(`
+	testCase := nerdtest.Setup()
+
+	testCase.Setup = func(data test.Data, helpers test.Helpers) {
+		dockerComposeYAML := fmt.Sprintf(`
 services:
 
   wordpress:
@@ -54,17 +62,52 @@ volumes:
   db:
 `, testutil.WordpressImage, testutil.MariaDBImage)
 
-	comp := testutil.NewComposeDir(t, dockerComposeYAML)
-	defer comp.CleanUp()
-	projectName := comp.ProjectName()
-	t.Logf("projectName=%q", projectName)
+		composePath := data.Temp().Save(dockerComposeYAML, "compose.yaml")
+
+		projectName := filepath.Base(filepath.Dir(composePath))
+		t.Logf("projectName=%q", projectName)
+
+		wordpressContainerName := serviceparser.DefaultContainerName(projectName, "wordpress", "1")
+		dbContainerName := serviceparser.DefaultContainerName(projectName, "db", "1")
+
+		data.Labels().Set("composeYAML", composePath)
+		data.Labels().Set("wordpressContainer", wordpressContainerName)
+		data.Labels().Set("dbContainer", dbContainerName)
+
+		helpers.Ensure("compose", "-f", composePath, "up", "-d")
+		nerdtest.EnsureContainerStarted(helpers, wordpressContainerName)
+		nerdtest.EnsureContainerStarted(helpers, dbContainerName)
+	}
+
+	testCase.SubTests = []*test.Case{
+		{
+			Description: "kill db container and exit with 137",
+			NoParallel:  true,
+			Setup: func(data test.Data, helpers test.Helpers) {
+				helpers.Ensure("compose", "-f", data.Labels().Get("composeYAML"), "kill", "db")
+				nerdtest.EnsureContainerExited(helpers, data.Labels().Get("dbContainer"), expect.ExitCodeSigkill)
+			},
+			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
+				return helpers.Command("compose", "-f", data.Labels().Get("composeYAML"), "ps", "db", "-a")
+			},
+			// Docker Compose v1: "Exit 137", v2: "exited (137)"
+			Expected: test.Expects(expect.ExitCodeSuccess, nil, expect.Match(regexp.MustCompile(` 137|\(137\)`))),
+		},
+		{
+			Description: "wordpress container is still running",
+			NoParallel:  true,
+			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
+				return helpers.Command("compose", "-f", data.Labels().Get("composeYAML"), "ps", "wordpress")
+			},
+			Expected: test.Expects(expect.ExitCodeSuccess, nil, expect.Match(regexp.MustCompile("Up|running"))),
+		},
+	}
 
-	base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d").AssertOK()
-	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").Run()
+	testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
+		if data.Labels().Get("composeYAML") != "" {
+			helpers.Anyhow("compose", "-f", data.Labels().Get("composeYAML"), "down", "-v")
+		}
+	}
 
-	base.ComposeCmd("-f", comp.YAMLFullPath(), "kill", "db").AssertOK()
-	time.Sleep(3 * time.Second)
-	// Docker Compose v1: "Exit 137", v2: "exited (137)"
-	base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "db", "-a").AssertOutContainsAny(" 137", "(137)")
-	base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "wordpress").AssertOutContainsAny("Up", "running")
+	testCase.Run(t)
 }

mod/tigron/expect/exit.go

@@ -19,6 +19,8 @@ package expect
 const (
 	// ExitCodeSuccess will ensure that the command effectively ran returned with exit code zero.
 	ExitCodeSuccess = 0
+	// ExitCodeSigkill verifies a container exited due to SIGKILL.
+	ExitCodeSigkill = 137
 	// ExitCodeGenericFail will verify that the command ran and exited with a non-zero error code.
 	// This does NOT include timeouts, cancellation, or signals.
 	ExitCodeGenericFail = -10

pkg/testutil/nerdtest/utilities.go

@@ -151,6 +151,49 @@ func EnsureContainerStarted(helpers test.Helpers, con string) {
 	}
 }
 
+func EnsureContainerExited(helpers test.Helpers, con string, exitCode int) {
+	helpers.T().Helper()
+	exited := false
+	for i := 0; i < maxRetry && !exited; i++ {
+		helpers.Command("container", "inspect", con).
+			Run(&test.Expected{
+				ExitCode: expect.ExitCodeNoCheck,
+				Output: func(stdout string, t tig.T) {
+					var dc []dockercompat.Container
+					err := json.Unmarshal([]byte(stdout), &dc)
+					if err != nil || len(dc) == 0 || (len(dc) > 0 && dc[0].State == nil) {
+						return
+					}
+					assert.Equal(t, len(dc), 1, "Unexpectedly got multiple results\n")
+					state := dc[0].State
+					if state.Running {
+						return
+					}
+					if state.Status != "exited" && state.Status != "dead" {
+						return
+					}
+					// Use a negative exitCode to ignore the exit code and only verify exited/dead state.
+					if exitCode >= 0 && state.ExitCode != exitCode {
+						return
+					}
+					exited = true
+				},
+			})
+		time.Sleep(sleep)
+	}
+
+	if !exited {
+		ins := helpers.Capture("container", "inspect", con)
+		lgs := helpers.Capture("logs", con)
+		ps := helpers.Capture("ps", "-a")
+		helpers.T().Log(ins)
+		helpers.T().Log(lgs)
+		helpers.T().Log(ps)
+		helpers.T().Log(fmt.Sprintf("container %s still not exited after %d retries", con, maxRetry))
+		helpers.T().FailNow()
+	}
+}
+
 func GenerateJWEKeyPair(data test.Data, helpers test.Helpers) (string, string) {
 	helpers.T().Helper()