Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Infinity constant to enable windows tests with old busybox #3631

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Add Infinity constant to enable windows tests with old busybox #3631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/nerdctl/container/container_commit_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestKubeCommitSave(t *testing.T) {
// NOTE: kubectl namespaces are not the same as containerd namespaces.
// We still want kube test objects segregated in their own Kube API namespace.
nerdtest.KubeCtlCommand(helpers, "create", "namespace", "nerdctl-test-k8s").Run(&test.Expected{})
nerdtest.KubeCtlCommand(helpers, "run", "--image", testutil.CommonImage, identifier, "--", "sleep", "Inf").Run(&test.Expected{})
nerdtest.KubeCtlCommand(helpers, "run", "--image", testutil.CommonImage, identifier, "--", "sleep", nerdtest.Infinity).Run(&test.Expected{})
nerdtest.KubeCtlCommand(helpers, "wait", "pod", identifier, "--for=condition=ready", "--timeout=1m").Run(&test.Expected{})
nerdtest.KubeCtlCommand(helpers, "exec", identifier, "--", "mkdir", "-p", "/tmp/whatever").Run(&test.Expected{})
nerdtest.KubeCtlCommand(helpers, "get", "pods", identifier, "-o", "jsonpath={ .status.containerStatuses[0].containerID }").Run(&test.Expected{
Expand Down
4 changes: 2 additions & 2 deletions cmd/nerdctl/container/container_commit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestCommit(t *testing.T) {
},
Setup: func(data test.Data, helpers test.Helpers) {
identifier := data.Identifier()
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", "infinity")
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", nerdtest.Infinity)
helpers.Ensure("exec", identifier, "sh", "-euxc", `echo hello-test-commit > /foo`)
},
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
Expand All @@ -63,7 +63,7 @@ func TestCommit(t *testing.T) {
},
Setup: func(data test.Data, helpers test.Helpers) {
identifier := data.Identifier()
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", "infinity")
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", nerdtest.Infinity)
nerdtest.EnsureContainerStarted(helpers, identifier)
helpers.Ensure("exec", identifier, "sh", "-euxc", `echo hello-test-commit > /foo`)
},
Expand Down
6 changes: 3 additions & 3 deletions cmd/nerdctl/container/container_create_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func TestIssue2993(t *testing.T) {
Setup: func(data test.Data, helpers test.Helpers) {
dataRoot := data.TempDir()

helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", nerdtest.Infinity)

h := getAddrHash(defaults.DefaultAddress)
dataStore := filepath.Join(dataRoot, h)
Expand All @@ -224,7 +224,7 @@ func TestIssue2993(t *testing.T) {
helpers.Anyhow("rm", "--data-root", data.TempDir(), "-f", data.Identifier())
},
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
return helpers.Command("run", "--data-root", data.TempDir(), "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
return helpers.Command("run", "--data-root", data.TempDir(), "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", nerdtest.Infinity)
},
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
return &test.Expected{
Expand All @@ -247,7 +247,7 @@ func TestIssue2993(t *testing.T) {
Setup: func(data test.Data, helpers test.Helpers) {
dataRoot := data.TempDir()

helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", nerdtest.Infinity)

h := getAddrHash(defaults.DefaultAddress)
dataStore := filepath.Join(dataRoot, h)
Expand Down
5 changes: 3 additions & 2 deletions cmd/nerdctl/container/container_exec_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"testing"

"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

func TestExecWithUser(t *testing.T) {
Expand All @@ -28,7 +29,7 @@ func TestExecWithUser(t *testing.T) {
testContainer := testutil.Identifier(t)

defer base.Cmd("rm", "-f", testContainer).Run()
base.Cmd("run", "-d", "--name", testContainer, testutil.CommonImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", testContainer, testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
base.EnsureContainerStarted(testContainer)

testCases := map[string]string{
Expand Down Expand Up @@ -59,7 +60,7 @@ func TestExecTTY(t *testing.T) {

testContainer := testutil.Identifier(t)
defer base.Cmd("rm", "-f", testContainer).Run()
base.Cmd("run", "-d", "--name", testContainer, testutil.CommonImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", testContainer, testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()

const sttyPartialOutput = "speed 38400 baud"
// unbuffer(1) emulates tty, which is required by `nerdctl run -t`.
Expand Down
5 changes: 3 additions & 2 deletions cmd/nerdctl/container/container_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"testing"

"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

// https://github.com/containerd/nerdctl/issues/2598
Expand All @@ -35,7 +36,7 @@ func TestContainerListWithFormatLabel(t *testing.T) {
base.Cmd("run", "-d",
"--name", cID,
"--label", labelK+"="+labelV,
testutil.CommonImage, "sleep", "infinity").AssertOK()
testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", cID).AssertOK()
base.Cmd("ps", "-a",
"--filter", "label="+labelK,
Expand All @@ -53,7 +54,7 @@ func TestContainerListWithJsonFormatLabel(t *testing.T) {
base.Cmd("run", "-d",
"--name", cID,
"--label", labelK+"="+labelV,
testutil.CommonImage, "sleep", "infinity").AssertOK()
testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", cID).AssertOK()
base.Cmd("ps", "-a",
"--filter", "label="+labelK,
Expand Down
4 changes: 2 additions & 2 deletions cmd/nerdctl/container/container_prune_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ func TestPruneContainer(t *testing.T) {
}

testCase.Setup = func(data test.Data, helpers test.Helpers) {
helpers.Ensure("run", "-d", "--name", data.Identifier("1"), "-v", "/anonymous", testutil.CommonImage, "sleep", "infinity")
helpers.Ensure("run", "-d", "--name", data.Identifier("1"), "-v", "/anonymous", testutil.CommonImage, "sleep", nerdtest.Infinity)
helpers.Ensure("exec", data.Identifier("1"), "touch", "/anonymous/foo")
helpers.Ensure("create", "--name", data.Identifier("2"), testutil.CommonImage, "sleep", "infinity")
helpers.Ensure("create", "--name", data.Identifier("2"), testutil.CommonImage, "sleep", nerdtest.Infinity)
}

testCase.Command = func(data test.Data, helpers test.Helpers) test.TestableCommand {
Expand Down
2 changes: 1 addition & 1 deletion cmd/nerdctl/container/container_remove_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestRemoveContainer(t *testing.T) {
testCase := nerdtest.Setup()

testCase.Setup = func(data test.Data, helpers test.Helpers) {
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "inf")
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", nerdtest.Infinity)
}

testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
Expand Down
7 changes: 4 additions & 3 deletions cmd/nerdctl/container/container_rename_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"testing"

"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

func TestRename(t *testing.T) {
Expand All @@ -28,7 +29,7 @@ func TestRename(t *testing.T) {
base := testutil.NewBase(t)

defer base.Cmd("rm", "-f", testContainerName).Run()
base.Cmd("run", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()

defer base.Cmd("rm", "-f", testContainerName+"_new").Run()
base.Cmd("rename", testContainerName, testContainerName+"_new").AssertOK()
Expand All @@ -44,11 +45,11 @@ func TestRenameUpdateHosts(t *testing.T) {
base := testutil.NewBase(t)

defer base.Cmd("rm", "-f", testContainerName).Run()
base.Cmd("run", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
base.EnsureContainerStarted(testContainerName)

defer base.Cmd("rm", "-f", testContainerName+"_1").Run()
base.Cmd("run", "-d", "--name", testContainerName+"_1", testutil.CommonImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", testContainerName+"_1", testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
base.EnsureContainerStarted(testContainerName + "_1")

defer base.Cmd("rm", "-f", testContainerName+"_new").Run()
Expand Down
5 changes: 3 additions & 2 deletions cmd/nerdctl/container/container_rename_windows_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ import (
"testing"

"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

func TestRenameProcessContainer(t *testing.T) {
testContainerName := testutil.Identifier(t)
base := testutil.NewBase(t)

defer base.Cmd("rm", "-f", testContainerName).Run()
base.Cmd("run", "--isolation", "process", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "--isolation", "process", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()

defer base.Cmd("rm", "-f", testContainerName+"_new").Run()
base.Cmd("rename", testContainerName, testContainerName+"_new").AssertOK()
Expand All @@ -45,7 +46,7 @@ func TestRenameHyperVContainer(t *testing.T) {
}

defer base.Cmd("rm", "-f", testContainerName).Run()
base.Cmd("run", "--isolation", "hyperv", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "--isolation", "hyperv", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()

defer base.Cmd("rm", "-f", testContainerName+"_new").Run()
base.Cmd("rename", testContainerName, testContainerName+"_new").AssertOK()
Expand Down
11 changes: 6 additions & 5 deletions cmd/nerdctl/container/container_restart_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"gotest.tools/v3/assert"

"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

func TestRestart(t *testing.T) {
Expand Down Expand Up @@ -52,11 +53,11 @@ func TestRestartPIDContainer(t *testing.T) {
base := testutil.NewBase(t)

baseContainerName := testutil.Identifier(t)
base.Cmd("run", "-d", "--name", baseContainerName, testutil.AlpineImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", baseContainerName, testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", baseContainerName).Run()

sharedContainerName := fmt.Sprintf("%s-shared", baseContainerName)
base.Cmd("run", "-d", "--name", sharedContainerName, fmt.Sprintf("--pid=container:%s", baseContainerName), testutil.AlpineImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", sharedContainerName, fmt.Sprintf("--pid=container:%s", baseContainerName), testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", sharedContainerName).Run()

base.Cmd("restart", baseContainerName).AssertOK()
Expand All @@ -79,11 +80,11 @@ func TestRestartIPCContainer(t *testing.T) {
const shmSize = "32m"
baseContainerName := testutil.Identifier(t)
defer base.Cmd("rm", "-f", baseContainerName).Run()
base.Cmd("run", "-d", "--shm-size", shmSize, "--ipc", "shareable", "--name", baseContainerName, testutil.AlpineImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--shm-size", shmSize, "--ipc", "shareable", "--name", baseContainerName, testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()

sharedContainerName := fmt.Sprintf("%s-shared", baseContainerName)
defer base.Cmd("rm", "-f", sharedContainerName).Run()
base.Cmd("run", "-d", "--name", sharedContainerName, fmt.Sprintf("--ipc=container:%s", baseContainerName), testutil.AlpineImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", sharedContainerName, fmt.Sprintf("--ipc=container:%s", baseContainerName), testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()

base.Cmd("stop", baseContainerName).Run()
base.Cmd("stop", sharedContainerName).Run()
Expand All @@ -104,7 +105,7 @@ func TestRestartWithTime(t *testing.T) {
base := testutil.NewBase(t)
tID := testutil.Identifier(t)

base.Cmd("run", "-d", "--name", tID, testutil.AlpineImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", tID, testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", tID).AssertOK()

inspect := base.InspectContainer(tID)
Expand Down
9 changes: 5 additions & 4 deletions cmd/nerdctl/container/container_run_cgroup_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (

"github.com/containerd/nerdctl/v2/pkg/cmd/container"
"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

func TestRunCgroupV2(t *testing.T) {
Expand Down Expand Up @@ -96,7 +97,7 @@ func TestRunCgroupV2(t *testing.T) {
"cpu.weight", "cpuset.cpus", "cpuset.mems").AssertOutExactly(expected2)

base.Cmd("run", "--name", testutil.Identifier(t)+"-testUpdate1", "-w", "/sys/fs/cgroup", "-d",
testutil.AlpineImage, "sleep", "infinity").AssertOK()
testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", testutil.Identifier(t)+"-testUpdate1").Run()
update := []string{"update", "--cpu-quota", "42000", "--cpuset-mems", "0", "--cpu-period", "100000",
"--memory", "42m",
Expand All @@ -115,7 +116,7 @@ func TestRunCgroupV2(t *testing.T) {

defer base.Cmd("rm", "-f", testutil.Identifier(t)+"-testUpdate2").Run()
base.Cmd("run", "--name", testutil.Identifier(t)+"-testUpdate2", "-w", "/sys/fs/cgroup", "-d",
testutil.AlpineImage, "sleep", "infinity").AssertOK()
testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
base.EnsureContainerStarted(testutil.Identifier(t) + "-testUpdate2")

base.Cmd("update", "--cpu-quota", "42000", "--cpuset-mems", "0", "--cpu-period", "100000",
Expand Down Expand Up @@ -199,7 +200,7 @@ func TestRunDevice(t *testing.T) {
"--name", containerName,
"--device", lo[0].Device+":r",
"--device", lo[1].Device,
testutil.AlpineImage, "sleep", "infinity").Run()
testutil.AlpineImage, "sleep", nerdtest.Infinity).Run()

base.Cmd("exec", containerName, "cat", lo[0].Device).AssertOutContains(loContent[0])
base.Cmd("exec", containerName, "cat", lo[1].Device).AssertOutContains(loContent[1])
Expand Down Expand Up @@ -364,7 +365,7 @@ func TestRunBlkioWeightCgroupV2(t *testing.T) {
containerName := testutil.Identifier(t)
defer base.Cmd("rm", "-f", containerName).AssertOK()
// when bfq io scheduler is used, the io.weight knob is exposed as io.bfq.weight
base.Cmd("run", "--name", containerName, "--blkio-weight", "300", "-w", "/sys/fs/cgroup", testutil.AlpineImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "--name", containerName, "--blkio-weight", "300", "-w", "/sys/fs/cgroup", testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
base.Cmd("exec", containerName, "cat", "io.bfq.weight").AssertOutExactly("default 300\n")
base.Cmd("update", containerName, "--blkio-weight", "400").AssertOK()
base.Cmd("exec", containerName, "cat", "io.bfq.weight").AssertOutExactly("default 400\n")
Expand Down
17 changes: 9 additions & 8 deletions cmd/nerdctl/container/container_run_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
"github.com/containerd/nerdctl/v2/pkg/strutil"
"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

func TestRunCustomRootfs(t *testing.T) {
Expand Down Expand Up @@ -108,7 +109,7 @@ func TestRunIPCContainerNotExists(t *testing.T) {
base := testutil.NewBase(t)

container := testutil.Identifier(t)
result := base.Cmd("run", "--name", container, "--ipc", "container:abcd1234", testutil.AlpineImage, "sleep", "infinity").Run()
result := base.Cmd("run", "--name", container, "--ipc", "container:abcd1234", testutil.AlpineImage, "sleep", nerdtest.Infinity).Run()
defer base.Cmd("rm", "-f", container)
combined := result.Combined()
if !strings.Contains(strings.ToLower(combined), "no such container: abcd1234") {
Expand All @@ -121,7 +122,7 @@ func TestRunShmSizeIPCContainer(t *testing.T) {
base := testutil.NewBase(t)

const shmSize = "32m"
sharedContainerResult := base.Cmd("run", "-d", "--ipc", "shareable", "--shm-size", shmSize, testutil.AlpineImage, "sleep", "infinity").Run()
sharedContainerResult := base.Cmd("run", "-d", "--ipc", "shareable", "--shm-size", shmSize, testutil.AlpineImage, "sleep", nerdtest.Infinity).Run()
baseContainerID := strings.TrimSpace(sharedContainerResult.Stdout())
defer base.Cmd("rm", "-f", baseContainerID).Run()

Expand All @@ -134,7 +135,7 @@ func TestRunIPCContainer(t *testing.T) {
base := testutil.NewBase(t)

const shmSize = "32m"
victimContainerResult := base.Cmd("run", "-d", "--ipc", "shareable", "--shm-size", shmSize, testutil.AlpineImage, "sleep", "infinity").Run()
victimContainerResult := base.Cmd("run", "-d", "--ipc", "shareable", "--shm-size", shmSize, testutil.AlpineImage, "sleep", nerdtest.Infinity).Run()
victimContainerID := strings.TrimSpace(victimContainerResult.Stdout())
defer base.Cmd("rm", "-f", victimContainerID).Run()

Expand Down Expand Up @@ -169,12 +170,12 @@ func TestRunPidContainer(t *testing.T) {
t.Parallel()
base := testutil.NewBase(t)

sharedContainerResult := base.Cmd("run", "-d", testutil.AlpineImage, "sleep", "infinity").Run()
sharedContainerResult := base.Cmd("run", "-d", testutil.AlpineImage, "sleep", nerdtest.Infinity).Run()
baseContainerID := strings.TrimSpace(sharedContainerResult.Stdout())
defer base.Cmd("rm", "-f", baseContainerID).Run()

base.Cmd("run", "--rm", fmt.Sprintf("--pid=container:%s", baseContainerID),
testutil.AlpineImage, "ps", "ax").AssertOutContains("sleep infinity")
testutil.AlpineImage, "ps", "ax").AssertOutContains("sleep " + nerdtest.Infinity)
}

func TestRunIpcHost(t *testing.T) {
Expand Down Expand Up @@ -278,7 +279,7 @@ func TestRunWithInit(t *testing.T) {
base := testutil.NewBase(t)

container := testutil.Identifier(t)
base.Cmd("run", "-d", "--name", container, testutil.AlpineImage, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", container, testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", container).Run()

base.Cmd("stop", "--time=3", container).AssertOK()
Expand All @@ -288,7 +289,7 @@ func TestRunWithInit(t *testing.T) {
// Test with --init-path
container1 := container + "-1"
base.Cmd("run", "-d", "--name", container1, "--init-binary", "tini-custom",
testutil.AlpineImage, "sleep", "infinity").AssertOK()
testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", container1).Run()

base.Cmd("stop", "--time=3", container1).AssertOK()
Expand All @@ -297,7 +298,7 @@ func TestRunWithInit(t *testing.T) {
// Test with --init
container2 := container + "-2"
base.Cmd("run", "-d", "--name", container2, "--init",
testutil.AlpineImage, "sleep", "infinity").AssertOK()
testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
defer base.Cmd("rm", "-f", container2).Run()

base.Cmd("stop", "--time=3", container2).AssertOK()
Expand Down
3 changes: 2 additions & 1 deletion cmd/nerdctl/container/container_run_mount_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
)

func TestRunVolume(t *testing.T) {
Expand Down Expand Up @@ -242,7 +243,7 @@ RUN echo -n "rev0" > /mnt/file

base.Cmd("volume", "create", volumeName)
runContainer := func() {
base.Cmd("run", "-d", "--name", containerName, "-v", volumeName+":/mnt", imageName, "sleep", "infinity").AssertOK()
base.Cmd("run", "-d", "--name", containerName, "-v", volumeName+":/mnt", imageName, "sleep", nerdtest.Infinity).AssertOK()
}
runContainer()
base.EnsureContainerStarted(containerName)
Expand Down
3 changes: 2 additions & 1 deletion cmd/nerdctl/container/container_run_network_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
"github.com/containerd/nerdctl/v2/pkg/testutil"
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
)

Expand Down Expand Up @@ -492,7 +493,7 @@ func TestSharedNetworkStack(t *testing.T) {
"--name", containerNameJoin,
"--network=container:"+containerName,
testutil.CommonImage,
"sleep", "infinity").AssertOK()
"sleep", nerdtest.Infinity).AssertOK()

base.Cmd("exec", containerNameJoin, "wget", "-qO-", "http://127.0.0.1:80").
AssertOutContains(testutil.NginxAlpineIndexHTMLSnippet)
Expand Down
Loading