test(e2e): remove legacy scaffolding after Ginkgo migration

tests/e2e/common.go

@@ -45,6 +45,38 @@ type testTool interface {
 	inspectPAndGet(string) (string, error)
 }
 
+type testMethod func(tool testTool) error
+
+type containerVolume struct {
+	Source string
+	Dest   string
+}
+
+type containerTestArgs struct {
+	Name           string
+	Image          string
+	Devmapper      bool
+	Seccomp        bool
+	UID            int
+	GID            int
+	Groups         []int64
+	Memory         string
+	Cli            string
+	Volumes        []containerVolume
+	StaticNet      bool
+	SideContainers []string
+	Skippable      bool
+	TestFunc       testMethod
+	ExpectOut      string
+}
+
+const (
+	testCtr     = "TestCtr"
+	testCrictl  = "TestCrictl"
+	testDocker  = "TestDocker"
+	testNerdctl = "TestNerdctl"
+)
+
 var errToolDoesNotSupport = errors.New("Operation not support")
 
 func commonNewContainerCmd(a containerTestArgs) string {

tests/e2e/crictl_test.go

@@ -22,8 +22,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const testCrictl = "TestCrictl"
-
 var _ = Describe("Crictl", Ordered, ContinueOnFailure, func() {
 	var tool *crictlInfo
 

tests/e2e/ctr_test.go

@@ -22,8 +22,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const testCtr = "TestCtr"
-
 var _ = Describe("Ctr", Ordered, ContinueOnFailure, func() {
 	var tool *ctrInfo
 

tests/e2e/docker_test.go

@@ -22,8 +22,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const testDocker = "TestDocker"
-
 var _ = Describe("Docker", Ordered, ContinueOnFailure, func() {
 	var tool *dockerInfo
 

tests/e2e/nerdctl_test.go

@@ -22,8 +22,6 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-const testNerdctl = "TestNerdctl"
-
 var _ = Describe("Nerdctl", Ordered, ContinueOnFailure, func() {
 	var tool *nerdctlInfo
 

tests/e2e/test_functions.go

@@ -34,6 +34,34 @@ import (
 
 var matchTest testMethod
 
+func testVerifyRm(tool testTool) error {
+	containerID := tool.getContainerID()
+	exists, err := tool.searchContainer(containerID)
+	if exists || err != nil {
+		return fmt.Errorf("Container %s is not removed: %v", containerID, err)
+	}
+	err = verifyNoStaleFiles(containerID)
+	if err != nil {
+		return fmt.Errorf("Failed to remove all stale files: %v", err)
+	}
+
+	return nil
+}
+
+func testCleanup(tool testTool) error {
+	err := tool.stopContainer()
+	if err != nil {
+		return fmt.Errorf("Failed to stop container: %v", err)
+	}
+
+	err = tool.rmContainer()
+	if err != nil {
+		return fmt.Errorf("Failed to remove container: %v", err)
+	}
+
+	return testVerifyRm(tool)
+}
+
 func blockMountTest(tool testTool) error {
 	args := tool.getTestArgs()
 	output, err := tool.logContainer()