Skip to content

Commit df523fe

Browse files
apostasieapostasie
committed
AlpineImage > CommonImage
Signed-off-by: apostasie <[email protected]>
1 parent 3bb441d commit df523fe

17 files changed

+123
-284
lines changed

‎cmd/nerdctl/container/container_create_linux_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func TestIssue2993(t *testing.T) {
199199
Setup: func(data test.Data, helpers test.Helpers) {
200200
dataRoot := data.TempDir()
201201

202-
helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
202+
helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.CommonImage, "sleep", "infinity")
203203

204204
h := getAddrHash(defaults.DefaultAddress)
205205
dataStore := filepath.Join(dataRoot, h)
@@ -223,7 +223,7 @@ func TestIssue2993(t *testing.T) {
223223
helpers.Anyhow("rm", "--data-root", data.TempDir(), "-f", data.Identifier())
224224
},
225225
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
226-
return helpers.Command("run", "--data-root", data.TempDir(), "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
226+
return helpers.Command("run", "--data-root", data.TempDir(), "--name", data.Identifier(), "-d", testutil.CommonImage, "sleep", "infinity")
227227
},
228228
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
229229
return &test.Expected{
@@ -246,7 +246,7 @@ func TestIssue2993(t *testing.T) {
246246
Setup: func(data test.Data, helpers test.Helpers) {
247247
dataRoot := data.TempDir()
248248

249-
helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.AlpineImage, "sleep", "infinity")
249+
helpers.Ensure("run", "--data-root", dataRoot, "--name", data.Identifier(), "-d", testutil.CommonImage, "sleep", "infinity")
250250

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

‎cmd/nerdctl/container/container_inspect_linux_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,9 @@ func TestContainerInspectState(t *testing.T) {
218218
t.Run(tc.name, func(t *testing.T) {
219219
defer base.Cmd("rm", "-f", tc.containerName).Run()
220220
if tc.want.Error != "" {
221-
base.Cmd("run", "--name", tc.containerName, testutil.AlpineImage, tc.cmd).AssertFail()
221+
base.Cmd("run", "--name", tc.containerName, testutil.CommonImage, tc.cmd).AssertFail()
222222
} else {
223-
base.Cmd("run", "--name", tc.containerName, testutil.AlpineImage, tc.cmd).AssertOK()
223+
base.Cmd("run", "--name", tc.containerName, testutil.CommonImage, tc.cmd).AssertOK()
224224
}
225225
inspect := base.InspectContainer(tc.containerName)
226226
assert.Assert(t, strings.Contains(inspect.State.Error, tc.want.Error), fmt.Sprintf("expected: %s, actual: %s", tc.want.Error, inspect.State.Error))

‎cmd/nerdctl/container/container_restart_linux_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ func TestRestartPIDContainer(t *testing.T) {
5252
base := testutil.NewBase(t)
5353

5454
baseContainerName := testutil.Identifier(t)
55-
base.Cmd("run", "-d", "--name", baseContainerName, testutil.AlpineImage, "sleep", "infinity").AssertOK()
55+
base.Cmd("run", "-d", "--name", baseContainerName, testutil.CommonImage, "sleep", "infinity").AssertOK()
5656
defer base.Cmd("rm", "-f", baseContainerName).Run()
5757

5858
sharedContainerName := fmt.Sprintf("%s-shared", baseContainerName)
59-
base.Cmd("run", "-d", "--name", sharedContainerName, fmt.Sprintf("--pid=container:%s", baseContainerName), testutil.AlpineImage, "sleep", "infinity").AssertOK()
59+
base.Cmd("run", "-d", "--name", sharedContainerName, fmt.Sprintf("--pid=container:%s", baseContainerName), testutil.CommonImage, "sleep", "infinity").AssertOK()
6060
defer base.Cmd("rm", "-f", sharedContainerName).Run()
6161

6262
base.Cmd("restart", baseContainerName).AssertOK()
@@ -79,11 +79,11 @@ func TestRestartIPCContainer(t *testing.T) {
7979
const shmSize = "32m"
8080
baseContainerName := testutil.Identifier(t)
8181
defer base.Cmd("rm", "-f", baseContainerName).Run()
82-
base.Cmd("run", "-d", "--shm-size", shmSize, "--ipc", "shareable", "--name", baseContainerName, testutil.AlpineImage, "sleep", "infinity").AssertOK()
82+
base.Cmd("run", "-d", "--shm-size", shmSize, "--ipc", "shareable", "--name", baseContainerName, testutil.CommonImage, "sleep", "infinity").AssertOK()
8383

8484
sharedContainerName := fmt.Sprintf("%s-shared", baseContainerName)
8585
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()
86+
base.Cmd("run", "-d", "--name", sharedContainerName, fmt.Sprintf("--ipc=container:%s", baseContainerName), testutil.CommonImage, "sleep", "infinity").AssertOK()
8787

8888
base.Cmd("stop", baseContainerName).Run()
8989
base.Cmd("stop", sharedContainerName).Run()
@@ -104,7 +104,7 @@ func TestRestartWithTime(t *testing.T) {
104104
base := testutil.NewBase(t)
105105
tID := testutil.Identifier(t)
106106

107-
base.Cmd("run", "-d", "--name", tID, testutil.AlpineImage, "sleep", "infinity").AssertOK()
107+
base.Cmd("run", "-d", "--name", tID, testutil.CommonImage, "sleep", "infinity").AssertOK()
108108
defer base.Cmd("rm", "-f", tID).AssertOK()
109109

110110
inspect := base.InspectContainer(tID)

‎cmd/nerdctl/container/container_run_cgroup_linux_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,19 @@ func TestRunCgroupV2(t *testing.T) {
8484
"--memory", "42m",
8585
"--pids-limit", "42",
8686
"--cpu-shares", "2000", "--cpuset-cpus", "0-1",
87-
"-w", "/sys/fs/cgroup", testutil.AlpineImage,
87+
"-w", "/sys/fs/cgroup", testutil.CommonImage,
8888
"cat", "cpu.max", "memory.max", "memory.swap.max",
8989
"pids.max", "cpu.weight", "cpuset.cpus", "cpuset.mems").AssertOutExactly(expected1)
9090
base.Cmd("run", "--rm",
9191
"--cpu-quota", "42000", "--cpuset-mems", "0",
9292
"--cpu-period", "100000", "--memory", "42m", "--memory-reservation", "6m", "--memory-swap", "100m",
9393
"--pids-limit", "42", "--cpu-shares", "2000", "--cpuset-cpus", "0-1",
94-
"-w", "/sys/fs/cgroup", testutil.AlpineImage,
94+
"-w", "/sys/fs/cgroup", testutil.CommonImage,
9595
"cat", "cpu.max", "memory.max", "memory.swap.max", "memory.low", "pids.max",
9696
"cpu.weight", "cpuset.cpus", "cpuset.mems").AssertOutExactly(expected2)
9797

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

116116
defer base.Cmd("rm", "-f", testutil.Identifier(t)+"-testUpdate2").Run()
117117
base.Cmd("run", "--name", testutil.Identifier(t)+"-testUpdate2", "-w", "/sys/fs/cgroup", "-d",
118-
testutil.AlpineImage, "sleep", "infinity").AssertOK()
118+
testutil.CommonImage, "sleep", "infinity").AssertOK()
119119
base.EnsureContainerStarted(testutil.Identifier(t) + "-testUpdate2")
120120

121121
base.Cmd("update", "--cpu-quota", "42000", "--cpuset-mems", "0", "--cpu-period", "100000",
@@ -165,8 +165,8 @@ func TestRunCgroupV1(t *testing.T) {
165165
cpusetCpus := "/sys/fs/cgroup/cpuset/cpuset.cpus"
166166

167167
const expected = "42000\n100000\n0\n44040192\n6291456\n104857600\n0\n42\n2000\n0-1\n"
168-
base.Cmd("run", "--rm", "--cpus", "0.42", "--cpuset-mems", "0", "--memory", "42m", "--memory-reservation", "6m", "--memory-swap", "100m", "--memory-swappiness", "0", "--pids-limit", "42", "--cpu-shares", "2000", "--cpuset-cpus", "0-1", testutil.AlpineImage, "cat", quota, period, cpusetMems, memoryLimit, memoryReservation, memorySwap, memorySwappiness, pidsLimit, cpuShare, cpusetCpus).AssertOutExactly(expected)
169-
base.Cmd("run", "--rm", "--cpu-quota", "42000", "--cpu-period", "100000", "--cpuset-mems", "0", "--memory", "42m", "--memory-reservation", "6m", "--memory-swap", "100m", "--memory-swappiness", "0", "--pids-limit", "42", "--cpu-shares", "2000", "--cpuset-cpus", "0-1", testutil.AlpineImage, "cat", quota, period, cpusetMems, memoryLimit, memoryReservation, memorySwap, memorySwappiness, pidsLimit, cpuShare, cpusetCpus).AssertOutExactly(expected)
168+
base.Cmd("run", "--rm", "--cpus", "0.42", "--cpuset-mems", "0", "--memory", "42m", "--memory-reservation", "6m", "--memory-swap", "100m", "--memory-swappiness", "0", "--pids-limit", "42", "--cpu-shares", "2000", "--cpuset-cpus", "0-1", testutil.CommonImage, "cat", quota, period, cpusetMems, memoryLimit, memoryReservation, memorySwap, memorySwappiness, pidsLimit, cpuShare, cpusetCpus).AssertOutExactly(expected)
169+
base.Cmd("run", "--rm", "--cpu-quota", "42000", "--cpu-period", "100000", "--cpuset-mems", "0", "--memory", "42m", "--memory-reservation", "6m", "--memory-swap", "100m", "--memory-swappiness", "0", "--pids-limit", "42", "--cpu-shares", "2000", "--cpuset-cpus", "0-1", testutil.CommonImage, "cat", quota, period, cpusetMems, memoryLimit, memoryReservation, memorySwap, memorySwappiness, pidsLimit, cpuShare, cpusetCpus).AssertOutExactly(expected)
170170
}
171171

172172
func TestRunDevice(t *testing.T) {
@@ -199,7 +199,7 @@ func TestRunDevice(t *testing.T) {
199199
"--name", containerName,
200200
"--device", lo[0].Device+":r",
201201
"--device", lo[1].Device,
202-
testutil.AlpineImage, "sleep", "infinity").Run()
202+
testutil.CommonImage, "sleep", "infinity").Run()
203203

204204
base.Cmd("exec", containerName, "cat", lo[0].Device).AssertOutContains(loContent[0])
205205
base.Cmd("exec", containerName, "cat", lo[1].Device).AssertOutContains(loContent[1])
@@ -290,7 +290,7 @@ func TestRunCgroupConf(t *testing.T) {
290290
if !info.MemoryLimit {
291291
t.Skip("test requires MemoryLimit")
292292
}
293-
base.Cmd("run", "--rm", "--cgroup-conf", "memory.high=33554432", "-w", "/sys/fs/cgroup", testutil.AlpineImage,
293+
base.Cmd("run", "--rm", "--cgroup-conf", "memory.high=33554432", "-w", "/sys/fs/cgroup", testutil.CommonImage,
294294
"cat", "memory.high").AssertOutExactly("33554432\n")
295295
}
296296

@@ -331,7 +331,7 @@ func TestRunCgroupParent(t *testing.T) {
331331
containerName,
332332
"--cgroupns=host",
333333
"--cgroup-parent", parent,
334-
testutil.AlpineImage,
334+
testutil.CommonImage,
335335
"sleep",
336336
"infinity",
337337
).AssertOK()
@@ -364,7 +364,7 @@ func TestRunBlkioWeightCgroupV2(t *testing.T) {
364364
containerName := testutil.Identifier(t)
365365
defer base.Cmd("rm", "-f", containerName).AssertOK()
366366
// 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()
367+
base.Cmd("run", "--name", containerName, "--blkio-weight", "300", "-w", "/sys/fs/cgroup", testutil.CommonImage, "sleep", "infinity").AssertOK()
368368
base.Cmd("exec", containerName, "cat", "io.bfq.weight").AssertOutExactly("default 300\n")
369369
base.Cmd("update", containerName, "--blkio-weight", "400").AssertOK()
370370
base.Cmd("exec", containerName, "cat", "io.bfq.weight").AssertOutExactly("default 400\n")

0 commit comments

Comments
 (0)