More

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

Author: apostasie

cmd/nerdctl/ipfs/ipfs_compose_linux_test.go

@@ -57,7 +57,7 @@ func TestIPFSCompNoBuild(t *testing.T) {
 
 	testCase.Setup = func(data test.Data, helpers test.Helpers) {
 		// Start Kubo
-		ipfsRegistry = registry.NewKuboRegistry(data, helpers, t, nil, 0, nil)
+		ipfsRegistry = registry.NewKuboRegistry(data, helpers, nil, 0, nil)
 		ipfsRegistry.Setup(data, helpers)
 		data.Labels().Set(ipfsAddrKey, fmt.Sprintf("/ip4/%s/tcp/%d", ipfsRegistry.IP, ipfsRegistry.Port))
 
@@ -270,6 +270,7 @@ COPY index.html /usr/share/nginx/html/index.html
 }
 
 func composeUP(data test.Data, helpers test.Helpers, dockerComposeYAML string, opts string) {
+	// FIXME: get rid of ComposeDir and remove the typecast
 	comp := testutil.NewComposeDir(helpers.T(), dockerComposeYAML)
 	// defer comp.CleanUp()
 
@@ -319,9 +320,13 @@ func composeUP(data test.Data, helpers test.Helpers, dockerComposeYAML string, o
 
 	if !wordpressWorking {
 		ccc := helpers.Capture("ps", "-a")
+		stdout := helpers.Capture("logs", projectName+"-wordpress-1")
+		stderr := helpers.Err("logs", projectName+"-wordpress-1")
 		helpers.T().Log(ccc)
-		helpers.T().Error(helpers.Err("logs", projectName+"-wordpress-1"))
-		helpers.T().Fatalf("wordpress is not working %v", err)
+		helpers.T().Log(stdout)
+		helpers.T().Log(stderr)
+		helpers.T().Log(fmt.Sprintf("wordpress is not working %v", err))
+		helpers.T().FailNow()
 	}
 
 	helpers.Ensure("compose", "-f", comp.YAMLFullPath(), "down", "-v")

cmd/nerdctl/ipfs/ipfs_kubo_linux_test.go

@@ -48,7 +48,7 @@ func TestIPFSAddrWithKubo(t *testing.T) {
 	testCase.Setup = func(data test.Data, helpers test.Helpers) {
 		helpers.Ensure("pull", "--quiet", testutil.CommonImage)
 
-		ipfsRegistry = registry.NewKuboRegistry(data, helpers, t, nil, 0, nil)
+		ipfsRegistry = registry.NewKuboRegistry(data, helpers, nil, 0, nil)
 		ipfsRegistry.Setup(data, helpers)
 		ipfsAddr := fmt.Sprintf("/ip4/%s/tcp/%d", ipfsRegistry.IP, ipfsRegistry.Port)
 		data.Labels().Set(ipfsAddrKey, ipfsAddr)

mod/tigron/internal/mocks/t.go

@@ -48,6 +48,9 @@ type (
 
 	TTempDirIn  struct{}
 	TTempDirOut = string
+
+	TSkipIn  []any
+	TSkipOut struct{}
 )
 
 type MockT struct {
@@ -93,3 +96,9 @@ func (m *MockT) TempDir() string {
 
 	return ""
 }
+
+func (m *MockT) Skip(args ...any) {
+	if handler := m.Retrieve(); handler != nil {
+		handler.(mimicry.Function[TSkipIn, TSkipOut])(args)
+	}
+}

mod/tigron/test/case.go

@@ -26,6 +26,7 @@ import (
 
 	"github.com/containerd/nerdctl/mod/tigron/internal/assertive"
 	"github.com/containerd/nerdctl/mod/tigron/internal/formatter"
+	"github.com/containerd/nerdctl/mod/tigron/tig"
 )
 
 // Case describes an entire test-case, including data, setup and cleanup routines, command and
@@ -63,7 +64,7 @@ type Case struct {
 
 	// Private
 	helpers Helpers
-	t       *testing.T
+	t       tig.T
 	parent  *Case
 }
 
@@ -151,7 +152,7 @@ func (test *Case) Run(t *testing.T) {
 		if test.Require != nil {
 			shouldRun, message := test.Require.Check(test.Data, test.helpers)
 			if !shouldRun {
-				test.t.Skipf("test skipped as: %s", message)
+				test.t.Skip("test skipped as: " + message)
 			}
 
 			if test.Require.Setup != nil {
@@ -180,7 +181,7 @@ func (test *Case) Run(t *testing.T) {
 
 		// Set parallel unless asked not to
 		if !test.NoParallel {
-			test.t.Parallel()
+			subT.Parallel()
 		}
 
 		// Execute cleanups now
@@ -197,7 +198,7 @@ func (test *Case) Run(t *testing.T) {
 			}
 
 			// Register the cleanups, in reverse
-			test.t.Cleanup(func() {
+			subT.Cleanup(func() {
 				test.t.Helper()
 				test.t.Log(
 					"\n\n" + formatter.Table(
@@ -263,14 +264,14 @@ func (test *Case) Run(t *testing.T) {
 
 		if len(test.SubTests) > 0 {
 			// Now go for the subtests
-			test.t.Logf("\n%s️ %q: into subtests prep", subinDecorator, test.t.Name())
+			test.t.Log(fmt.Sprintf("\n%s️ %q: into subtests prep", subinDecorator, test.t.Name()))
 
 			for _, subTest := range test.SubTests {
 				subTest.parent = test
-				subTest.Run(test.t)
+				subTest.Run(subT)
 			}
 
-			test.t.Logf("\n%s️ %q: done with subtests prep", suboutDecorator, test.t.Name())
+			test.t.Log(fmt.Sprintf("\n%s️ %q: done with subtests prep", suboutDecorator, test.t.Name()))
 		}
 	}
 

mod/tigron/test/command.go

@@ -23,13 +23,13 @@ import (
 	"os"
 	"strconv"
 	"strings"
-	"testing"
 	"time"
 
 	"github.com/containerd/nerdctl/mod/tigron/internal"
 	"github.com/containerd/nerdctl/mod/tigron/internal/assertive"
 	"github.com/containerd/nerdctl/mod/tigron/internal/com"
 	"github.com/containerd/nerdctl/mod/tigron/internal/formatter"
+	"github.com/containerd/nerdctl/mod/tigron/tig"
 )
 
 const (
@@ -59,7 +59,7 @@ type CustomizableCommand interface {
 	// default it pass any that is defined by WithEnv
 	WithBlacklist(env []string)
 	// T returns the current testing object
-	T() *testing.T
+	T() tig.T
 
 	// withEnv *copies* the passed map to the environment of the command to be executed
 	// Note that this will override any variable defined in the embedding environment
@@ -69,7 +69,7 @@ type CustomizableCommand interface {
 	withTempDir(path string)
 	// WithConfig allows passing custom config properties from the test to the base command
 	withConfig(config Config)
-	withT(t *testing.T)
+	withT(t tig.T)
 	// Clear does a clone, but will clear binary and arguments while retaining the env, or any other
 	// custom properties Gotcha: if genericCommand is embedded with a custom Run and an overridden
 	// clear to return the embedding type the result will be the embedding command, no longer the
@@ -102,7 +102,7 @@ type GenericCommand struct {
 	TempDir string
 	Env     map[string]string
 
-	t *testing.T
+	t tig.T
 
 	cmd   *com.Command
 	async bool
@@ -337,7 +337,7 @@ func (gc *GenericCommand) Clone() TestableCommand {
 	return &clone
 }
 
-func (gc *GenericCommand) T() *testing.T {
+func (gc *GenericCommand) T() tig.T {
 	return gc.t
 }
 
@@ -361,7 +361,7 @@ func (gc *GenericCommand) clear() TestableCommand {
 	return &comcopy
 }
 
-func (gc *GenericCommand) withT(t *testing.T) {
+func (gc *GenericCommand) withT(t tig.T) {
 	t.Helper()
 	gc.t = t
 }

mod/tigron/test/helpers.go

@@ -17,8 +17,6 @@
 package test
 
 import (
-	"testing"
-
 	"github.com/containerd/nerdctl/mod/tigron/internal"
 	"github.com/containerd/nerdctl/mod/tigron/tig"
 )
@@ -28,7 +26,7 @@ import (
 type helpersInternal struct {
 	cmdInternal CustomizableCommand
 
-	t *testing.T
+	t tig.T
 }
 
 // Ensure will run a command and make sure it is successful.
@@ -104,6 +102,6 @@ func (help *helpersInternal) Write(key ConfigKey, value ConfigValue) {
 	help.cmdInternal.write(key, value)
 }
 
-func (help *helpersInternal) T() *testing.T {
+func (help *helpersInternal) T() tig.T {
 	return help.t
 }

mod/tigron/test/interfaces.go

@@ -19,8 +19,9 @@ package test
 import (
 	"io"
 	"os"
-	"testing"
 	"time"
+
+	"github.com/containerd/nerdctl/mod/tigron/tig"
 )
 
 // DataLabels holds key-value test information set by the test authors.
@@ -93,7 +94,7 @@ type Helpers interface {
 	Write(key ConfigKey, value ConfigValue)
 
 	// T returns the current testing object.
-	T() *testing.T
+	T() tig.T
 }
 
 // The TestableCommand interface represents a low-level command to execute, typically to be compared

mod/tigron/test/test.go

@@ -17,13 +17,13 @@
 package test
 
 import (
-	"testing"
+	"github.com/containerd/nerdctl/mod/tigron/tig"
 )
 
 // Testable TODO.
 type Testable interface {
-	CustomCommand(testCase *Case, t *testing.T) CustomizableCommand
-	AmbientRequirements(testCase *Case, t *testing.T)
+	CustomCommand(testCase *Case, t tig.T) CustomizableCommand
+	AmbientRequirements(testCase *Case, t tig.T)
 }
 
 // FIXME

mod/tigron/tig/t.go

@@ -37,4 +37,5 @@ type T interface {
 	Log(args ...any)
 	Name() string
 	TempDir() string
+	Skip(args ...any)
 }

pkg/testutil/compose.go

@@ -18,23 +18,26 @@ package testutil
 
 import (
 	"context"
+	"fmt"
 	"os"
 	"path/filepath"
-	"testing"
 
 	"github.com/compose-spec/compose-go/v2/loader"
 	compose "github.com/compose-spec/compose-go/v2/types"
+
+	"github.com/containerd/nerdctl/mod/tigron/tig"
 )
 
 type ComposeDir struct {
-	t            testing.TB
+	t            tig.T
 	dir          string
 	yamlBasePath string
 }
 
 func (cd *ComposeDir) WriteFile(name, content string) {
 	if err := os.WriteFile(filepath.Join(cd.dir, name), []byte(content), 0644); err != nil {
-		cd.t.Fatal(err)
+		cd.t.Log(fmt.Sprintf("Failed to create file %s", err))
+		cd.t.FailNow()
 	}
 }
 
@@ -54,10 +57,11 @@ func (cd *ComposeDir) CleanUp() {
 	os.RemoveAll(cd.dir)
 }
 
-func NewComposeDir(t testing.TB, dockerComposeYAML string) *ComposeDir {
+func NewComposeDir(t tig.T, dockerComposeYAML string) *ComposeDir {
 	tmpDir, err := os.MkdirTemp("", "nerdctl-compose-test")
 	if err != nil {
-		t.Fatal(err)
+		t.Log(fmt.Sprintf("Failed to create temp dir: %s", err))
+		t.FailNow()
 	}
 	cd := &ComposeDir{
 		t:            t,