Skip to content

Commit bfc8e0b

Browse files
apostasieapostasie
committed
Add Infinity constant to enable windows testing compat
Signed-off-by: apostasie <[email protected]>
1 parent cabd5bf commit bfc8e0b

20 files changed

+69
-51
lines changed

‎cmd/nerdctl/container/container_commit_linux_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestKubeCommitSave(t *testing.T) {
3636
// NOTE: kubectl namespaces are not the same as containerd namespaces.
3737
// We still want kube test objects segregated in their own Kube API namespace.
3838
nerdtest.KubeCtlCommand(helpers, "create", "namespace", "nerdctl-test-k8s").Run(&test.Expected{})
39-
nerdtest.KubeCtlCommand(helpers, "run", "--image", testutil.CommonImage, identifier, "--", "sleep", "Inf").Run(&test.Expected{})
39+
nerdtest.KubeCtlCommand(helpers, "run", "--image", testutil.CommonImage, identifier, "--", "sleep", nerdtest.Infinity).Run(&test.Expected{})
4040
nerdtest.KubeCtlCommand(helpers, "wait", "pod", identifier, "--for=condition=ready", "--timeout=1m").Run(&test.Expected{})
4141
nerdtest.KubeCtlCommand(helpers, "exec", identifier, "--", "mkdir", "-p", "/tmp/whatever").Run(&test.Expected{})
4242
nerdtest.KubeCtlCommand(helpers, "get", "pods", identifier, "-o", "jsonpath={ .status.containerStatuses[0].containerID }").Run(&test.Expected{

‎cmd/nerdctl/container/container_commit_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestCommit(t *testing.T) {
3838
},
3939
Setup: func(data test.Data, helpers test.Helpers) {
4040
identifier := data.Identifier()
41-
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", "infinity")
41+
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", nerdtest.Infinity)
4242
helpers.Ensure("exec", identifier, "sh", "-euxc", `echo hello-test-commit > /foo`)
4343
},
4444
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -63,7 +63,7 @@ func TestCommit(t *testing.T) {
6363
},
6464
Setup: func(data test.Data, helpers test.Helpers) {
6565
identifier := data.Identifier()
66-
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", "infinity")
66+
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", nerdtest.Infinity)
6767
nerdtest.EnsureContainerStarted(helpers, identifier)
6868
helpers.Ensure("exec", identifier, "sh", "-euxc", `echo hello-test-commit > /foo`)
6969
},

‎cmd/nerdctl/container/container_create_linux_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func TestIssue2993(t *testing.T) {
200200
Setup: func(data test.Data, helpers test.Helpers) {
201201
dataRoot := data.TempDir()
202202

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

205205
h := getAddrHash(defaults.DefaultAddress)
206206
dataStore := filepath.Join(dataRoot, h)
@@ -224,7 +224,7 @@ func TestIssue2993(t *testing.T) {
224224
helpers.Anyhow("rm", "--data-root", data.TempDir(), "-f", data.Identifier())
225225
},
226226
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
227-
return helpers.Command("run", "--data-root", data.TempDir(), "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
227+
return helpers.Command("run", "--data-root", data.TempDir(), "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", nerdtest.Infinity)
228228
},
229229
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
230230
return &test.Expected{
@@ -247,7 +247,7 @@ func TestIssue2993(t *testing.T) {
247247
Setup: func(data test.Data, helpers test.Helpers) {
248248
dataRoot := data.TempDir()
249249

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

252252
h := getAddrHash(defaults.DefaultAddress)
253253
dataStore := filepath.Join(dataRoot, h)

‎cmd/nerdctl/container/container_exec_linux_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"testing"
2121

2222
"github.com/containerd/nerdctl/v2/pkg/testutil"
23+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
2324
)
2425

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

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

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

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

6465
const sttyPartialOutput = "speed 38400 baud"
6566
// unbuffer(1) emulates tty, which is required by `nerdctl run -t`.

‎cmd/nerdctl/container/container_list_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"testing"
2222

2323
"github.com/containerd/nerdctl/v2/pkg/testutil"
24+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
2425
)
2526

2627
// https://github.com/containerd/nerdctl/issues/2598
@@ -35,7 +36,7 @@ func TestContainerListWithFormatLabel(t *testing.T) {
3536
base.Cmd("run", "-d",
3637
"--name", cID,
3738
"--label", labelK+"="+labelV,
38-
testutil.CommonImage, "sleep", "infinity").AssertOK()
39+
testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
3940
defer base.Cmd("rm", "-f", cID).AssertOK()
4041
base.Cmd("ps", "-a",
4142
"--filter", "label="+labelK,
@@ -53,7 +54,7 @@ func TestContainerListWithJsonFormatLabel(t *testing.T) {
5354
base.Cmd("run", "-d",
5455
"--name", cID,
5556
"--label", labelK+"="+labelV,
56-
testutil.CommonImage, "sleep", "infinity").AssertOK()
57+
testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
5758
defer base.Cmd("rm", "-f", cID).AssertOK()
5859
base.Cmd("ps", "-a",
5960
"--filter", "label="+labelK,

‎cmd/nerdctl/container/container_prune_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ func TestPruneContainer(t *testing.T) {
3535
}
3636

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

4343
testCase.Command = func(data test.Data, helpers test.Helpers) test.TestableCommand {

‎cmd/nerdctl/container/container_remove_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestRemoveContainer(t *testing.T) {
2828
testCase := nerdtest.Setup()
2929

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

3434
testCase.Cleanup = func(data test.Data, helpers test.Helpers) {

‎cmd/nerdctl/container/container_rename_linux_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"testing"
2121

2222
"github.com/containerd/nerdctl/v2/pkg/testutil"
23+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
2324
)
2425

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

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

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

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

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

5455
defer base.Cmd("rm", "-f", testContainerName+"_new").Run()

‎cmd/nerdctl/container/container_rename_windows_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ import (
2020
"testing"
2121

2222
"github.com/containerd/nerdctl/v2/pkg/testutil"
23+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
2324
)
2425

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

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

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

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

5051
defer base.Cmd("rm", "-f", testContainerName+"_new").Run()
5152
base.Cmd("rename", testContainerName, testContainerName+"_new").AssertOK()

‎cmd/nerdctl/container/container_restart_linux_test.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"gotest.tools/v3/assert"
2626

2727
"github.com/containerd/nerdctl/v2/pkg/testutil"
28+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
2829
)
2930

3031
func TestRestart(t *testing.T) {
@@ -52,11 +53,11 @@ func TestRestartPIDContainer(t *testing.T) {
5253
base := testutil.NewBase(t)
5354

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

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

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

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

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

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

110111
inspect := base.InspectContainer(tID)

‎cmd/nerdctl/container/container_run_cgroup_linux_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131

3232
"github.com/containerd/nerdctl/v2/pkg/cmd/container"
3333
"github.com/containerd/nerdctl/v2/pkg/testutil"
34+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
3435
)
3536

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

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

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

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

204205
base.Cmd("exec", containerName, "cat", lo[0].Device).AssertOutContains(loContent[0])
205206
base.Cmd("exec", containerName, "cat", lo[1].Device).AssertOutContains(loContent[1])
@@ -364,7 +365,7 @@ func TestRunBlkioWeightCgroupV2(t *testing.T) {
364365
containerName := testutil.Identifier(t)
365366
defer base.Cmd("rm", "-f", containerName).AssertOK()
366367
// when bfq io scheduler is used, the io.weight knob is exposed as io.bfq.weight
367-
base.Cmd("run", "--name", containerName, "--blkio-weight", "300", "-w", "/sys/fs/cgroup", testutil.AlpineImage, "sleep", "infinity").AssertOK()
368+
base.Cmd("run", "--name", containerName, "--blkio-weight", "300", "-w", "/sys/fs/cgroup", testutil.AlpineImage, "sleep", nerdtest.Infinity).AssertOK()
368369
base.Cmd("exec", containerName, "cat", "io.bfq.weight").AssertOutExactly("default 300\n")
369370
base.Cmd("update", containerName, "--blkio-weight", "400").AssertOK()
370371
base.Cmd("exec", containerName, "cat", "io.bfq.weight").AssertOutExactly("default 400\n")

‎cmd/nerdctl/container/container_run_linux_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
4040
"github.com/containerd/nerdctl/v2/pkg/strutil"
4141
"github.com/containerd/nerdctl/v2/pkg/testutil"
42+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
4243
)
4344

4445
func TestRunCustomRootfs(t *testing.T) {
@@ -108,7 +109,7 @@ func TestRunIPCContainerNotExists(t *testing.T) {
108109
base := testutil.NewBase(t)
109110

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

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

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

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

@@ -169,12 +170,12 @@ func TestRunPidContainer(t *testing.T) {
169170
t.Parallel()
170171
base := testutil.NewBase(t)
171172

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

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

180181
func TestRunIpcHost(t *testing.T) {
@@ -278,7 +279,7 @@ func TestRunWithInit(t *testing.T) {
278279
base := testutil.NewBase(t)
279280

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

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

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

303304
base.Cmd("stop", "--time=3", container2).AssertOK()

‎cmd/nerdctl/container/container_run_mount_linux_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
3232
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
3333
"github.com/containerd/nerdctl/v2/pkg/testutil"
34+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
3435
)
3536

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

243244
base.Cmd("volume", "create", volumeName)
244245
runContainer := func() {
245-
base.Cmd("run", "-d", "--name", containerName, "-v", volumeName+":/mnt", imageName, "sleep", "infinity").AssertOK()
246+
base.Cmd("run", "-d", "--name", containerName, "-v", volumeName+":/mnt", imageName, "sleep", nerdtest.Infinity).AssertOK()
246247
}
247248
runContainer()
248249
base.EnsureContainerStarted(containerName)

‎cmd/nerdctl/container/container_run_network_linux_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import (
3939
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
4040
"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
4141
"github.com/containerd/nerdctl/v2/pkg/testutil"
42+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
4243
"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
4344
)
4445

@@ -492,7 +493,7 @@ func TestSharedNetworkStack(t *testing.T) {
492493
"--name", containerNameJoin,
493494
"--network=container:"+containerName,
494495
testutil.CommonImage,
495-
"sleep", "infinity").AssertOK()
496+
"sleep", nerdtest.Infinity).AssertOK()
496497

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

0 commit comments

Comments
 (0)