Container create tests cleanup

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

Author: apostasie

cmd/nerdctl/container/container_create_linux_test.go

@@ -36,18 +36,6 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/testutil/test"
 )
 
-func TestCreate(t *testing.T) {
-	t.Parallel()
-	base := testutil.NewBase(t)
-	tID := testutil.Identifier(t)
-
-	base.Cmd("create", "--name", tID, testutil.CommonImage, "echo", "foo").AssertOK()
-	defer base.Cmd("rm", "-f", tID).Run()
-	base.Cmd("ps", "-a").AssertOutContains("Created")
-	base.Cmd("start", tID).AssertOK()
-	base.Cmd("logs", tID).AssertOutContains("foo")
-}
-
 func TestCreateWithLabel(t *testing.T) {
 	t.Parallel()
 	base := testutil.NewBase(t)
@@ -217,8 +205,7 @@ func TestIssue2993(t *testing.T) {
 				h := getAddrHash(defaults.DefaultAddress)
 				dataStore := filepath.Join(dataRoot, h)
 
-				// FIXME: update with next tooling iteration to retrieve from the command
-				namespace := "nerdctl-test"
+				namespace := string(helpers.Read(nerdtest.Namespace))
 
 				containersPath := filepath.Join(dataStore, "containers", namespace)
 				containersDirs, err := os.ReadDir(containersPath)
@@ -265,8 +252,7 @@ func TestIssue2993(t *testing.T) {
 				h := getAddrHash(defaults.DefaultAddress)
 				dataStore := filepath.Join(dataRoot, h)
 
-				// FIXME: update with next tooling iteration to retrieve from the command
-				namespace := "nerdctl-test"
+				namespace := string(helpers.Read(nerdtest.Namespace))
 
 				containersPath := filepath.Join(dataStore, "containers", namespace)
 				containersDirs, err := os.ReadDir(containersPath)

cmd/nerdctl/container/container_create_test.go

@@ -0,0 +1,125 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package container
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"gotest.tools/v3/assert"
+
+	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
+	"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
+	"github.com/containerd/nerdctl/v2/pkg/testutil/test"
+)
+
+func TestCreate(t *testing.T) {
+	testCase := nerdtest.Setup()
+	testCase.Setup = func(data test.Data, helpers test.Helpers) {
+		helpers.Ensure("create", "--name", data.Identifier("container"), testutil.CommonImage, "echo", "foo")
+		data.Set("cID", data.Identifier("container"))
+	}
+	testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
+		helpers.Anyhow("rm", "-f", data.Identifier("container"))
+	}
+
+	testCase.SubTests = []*test.Case{
+		{
+			Description: "ps -a",
+			NoParallel:  true,
+			Command:     test.Command("ps", "-a"),
+			// FIXME: this might get a false positive if other tests have created a container
+			Expected: test.Expects(0, nil, test.Contains("Created")),
+		},
+		{
+			Description: "start",
+			NoParallel:  true,
+			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
+				return helpers.Command("start", data.Get("cID"))
+			},
+			Expected: test.Expects(0, nil, nil),
+		},
+		{
+			Description: "logs",
+			NoParallel:  true,
+			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
+				return helpers.Command("logs", data.Get("cID"))
+			},
+			Expected: test.Expects(0, nil, test.Contains("foo")),
+		},
+	}
+
+	testCase.Run(t)
+}
+
+func TestCreateHyperVContainer(t *testing.T) {
+	testCase := nerdtest.Setup()
+
+	testCase.Require = nerdtest.HyperV
+
+	testCase.Setup = func(data test.Data, helpers test.Helpers) {
+		helpers.Ensure("create", "--isolation", "hyperv", "--name", data.Identifier("container"), testutil.CommonImage, "echo", "foo")
+		data.Set("cID", data.Identifier("container"))
+	}
+
+	testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
+		helpers.Anyhow("rm", "-f", data.Identifier("container"))
+	}
+
+	testCase.SubTests = []*test.Case{
+		{
+			Description: "ps -a",
+			NoParallel:  true,
+			Command:     test.Command("ps", "-a"),
+			// FIXME: this might get a false positive if other tests have created a container
+			Expected: test.Expects(0, nil, test.Contains("Created")),
+		},
+		{
+			Description: "start",
+			NoParallel:  true,
+			Setup: func(data test.Data, helpers test.Helpers) {
+				helpers.Ensure("start", data.Get("cID"))
+				ran := false
+				for i := 0; i < 10 && !ran; i++ {
+					helpers.Command("container", "inspect", data.Get("cID")).
+						Run(&test.Expected{
+							ExitCode: test.ExitCodeNoCheck,
+							Output: func(stdout string, info string, t *testing.T) {
+								var dc []dockercompat.Container
+								err := json.Unmarshal([]byte(stdout), &dc)
+								if err != nil || len(dc) == 0 {
+									return
+								}
+								assert.Equal(t, len(dc), 1, "Unexpectedly got multiple results\n"+info)
+								ran = dc[0].State.Status == "exited"
+							},
+						})
+					time.Sleep(time.Second)
+				}
+				assert.Assert(t, ran, "container did not ran after 10 seconds")
+			},
+			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
+				return helpers.Command("logs", data.Get("cID"))
+			},
+			Expected: test.Expects(0, nil, test.Contains("foo")),
+		},
+	}
+
+	testCase.Run(t)
+}