Skip to content

Commit 33e4502

Browse files
AkihiroSudaapostasie
AkihiroSuda
authored and
apostasie
committed
Merge pull request #3630 from apostasie/cosmetic-tests
Cosmetic tests
2 parents 5c0f90f + 7b8edba commit 33e4502

27 files changed

+136
-110
lines changed

‎cmd/nerdctl/completion/completion_test.go‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ func TestCompletion(t *testing.T) {
3434
testCase := &test.Case{
3535
Require: test.Not(nerdtest.Docker),
3636
Setup: func(data test.Data, helpers test.Helpers) {
37+
identifier := data.Identifier()
3738
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
38-
helpers.Ensure("network", "create", data.Identifier())
39-
helpers.Ensure("volume", "create", data.Identifier())
40-
data.Set("identifier", data.Identifier())
39+
helpers.Ensure("network", "create", identifier)
40+
helpers.Ensure("volume", "create", identifier)
41+
data.Set("identifier", identifier)
4142
},
4243
Cleanup: func(data test.Data, helpers test.Helpers) {
43-
helpers.Anyhow("network", "rm", data.Identifier())
44-
helpers.Anyhow("volume", "rm", data.Identifier())
44+
identifier := data.Identifier()
45+
helpers.Anyhow("network", "rm", identifier)
46+
helpers.Anyhow("volume", "rm", identifier)
4547
},
4648
SubTests: []*test.Case{
4749
{

‎cmd/nerdctl/container/container_commit_linux_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ func TestKubeCommitSave(t *testing.T) {
3131
testCase.Require = nerdtest.OnlyKubernetes
3232

3333
testCase.Setup = func(data test.Data, helpers test.Helpers) {
34+
identifier := data.Identifier()
3435
containerID := ""
3536
// NOTE: kubectl namespaces are not the same as containerd namespaces.
3637
// We still want kube test objects segregated in their own Kube API namespace.
3738
nerdtest.KubeCtlCommand(helpers, "create", "namespace", "nerdctl-test-k8s").Run(&test.Expected{})
38-
nerdtest.KubeCtlCommand(helpers, "run", "--image", testutil.CommonImage, data.Identifier(), "--", "sleep", "Inf").Run(&test.Expected{})
39-
nerdtest.KubeCtlCommand(helpers, "wait", "pod", data.Identifier(), "--for=condition=ready", "--timeout=1m").Run(&test.Expected{})
40-
nerdtest.KubeCtlCommand(helpers, "exec", data.Identifier(), "--", "mkdir", "-p", "/tmp/whatever").Run(&test.Expected{})
41-
nerdtest.KubeCtlCommand(helpers, "get", "pods", data.Identifier(), "-o", "jsonpath={ .status.containerStatuses[0].containerID }").Run(&test.Expected{
39+
nerdtest.KubeCtlCommand(helpers, "run", "--image", testutil.CommonImage, identifier, "--", "sleep", nerdtest.Infinity).Run(&test.Expected{})
40+
nerdtest.KubeCtlCommand(helpers, "wait", "pod", identifier, "--for=condition=ready", "--timeout=1m").Run(&test.Expected{})
41+
nerdtest.KubeCtlCommand(helpers, "exec", identifier, "--", "mkdir", "-p", "/tmp/whatever").Run(&test.Expected{})
42+
nerdtest.KubeCtlCommand(helpers, "get", "pods", identifier, "-o", "jsonpath={ .status.containerStatuses[0].containerID }").Run(&test.Expected{
4243
Output: func(stdout string, info string, t *testing.T) {
4344
containerID = strings.TrimPrefix(stdout, "containerd://")
4445
},

‎cmd/nerdctl/container/container_commit_test.go‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,48 +32,50 @@ func TestCommit(t *testing.T) {
3232
Description: "with pause",
3333
Require: nerdtest.CGroup,
3434
Cleanup: func(data test.Data, helpers test.Helpers) {
35-
helpers.Anyhow("rm", "-f", data.Identifier())
36-
helpers.Anyhow("rmi", "-f", data.Identifier())
35+
identifier := data.Identifier()
36+
helpers.Anyhow("rm", "-f", identifier)
37+
helpers.Anyhow("rmi", "-f", identifier)
3738
},
3839
Setup: func(data test.Data, helpers test.Helpers) {
39-
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
40-
helpers.Ensure("exec", data.Identifier(), "sh", "-euxc", `echo hello-test-commit > /foo`)
40+
identifier := data.Identifier()
41+
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", nerdtest.Infinity)
42+
helpers.Ensure("exec", identifier, "sh", "-euxc", `echo hello-test-commit > /foo`)
4143
},
4244
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
45+
identifier := data.Identifier()
4346
helpers.Ensure(
4447
"commit",
4548
"-c", `CMD ["/foo"]`,
4649
"-c", `ENTRYPOINT ["cat"]`,
4750
"--pause=true",
48-
data.Identifier(), data.Identifier())
49-
return helpers.Command("run", "--rm", data.Identifier())
51+
identifier, identifier)
52+
return helpers.Command("run", "--rm", identifier)
5053
},
5154
Expected: test.Expects(0, nil, test.Equals("hello-test-commit\n")),
5255
},
5356
{
5457
Description: "no pause",
5558
Require: test.Not(test.Windows),
5659
Cleanup: func(data test.Data, helpers test.Helpers) {
57-
helpers.Anyhow("rm", "-f", data.Identifier())
58-
helpers.Anyhow("rmi", "-f", data.Identifier())
60+
identifier := data.Identifier()
61+
helpers.Anyhow("rm", "-f", identifier)
62+
helpers.Anyhow("rmi", "-f", identifier)
5963
},
6064
Setup: func(data test.Data, helpers test.Helpers) {
61-
// See note above about docker failing.
62-
if nerdtest.IsDocker() {
63-
helpers.Ensure("pull", testutil.CommonImage)
64-
}
65-
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
66-
nerdtest.EnsureContainerStarted(helpers, data.Identifier())
67-
helpers.Ensure("exec", data.Identifier(), "sh", "-euxc", `echo hello-test-commit > /foo`)
65+
identifier := data.Identifier()
66+
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", nerdtest.Infinity)
67+
nerdtest.EnsureContainerStarted(helpers, identifier)
68+
helpers.Ensure("exec", identifier, "sh", "-euxc", `echo hello-test-commit > /foo`)
6869
},
6970
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
71+
identifier := data.Identifier()
7072
helpers.Ensure(
7173
"commit",
7274
"-c", `CMD ["/foo"]`,
7375
"-c", `ENTRYPOINT ["cat"]`,
7476
"--pause=false",
75-
data.Identifier(), data.Identifier())
76-
return helpers.Command("run", "--rm", data.Identifier())
77+
identifier, identifier)
78+
return helpers.Command("run", "--rm", identifier)
7779
},
7880
Expected: test.Expects(0, nil, test.Equals("hello-test-commit\n")),
7981
},

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestExecWithUser(t *testing.T) {
2828
testContainer := testutil.Identifier(t)
2929

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

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

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

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

‎cmd/nerdctl/container/container_list_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestContainerListWithFormatLabel(t *testing.T) {
3535
base.Cmd("run", "-d",
3636
"--name", cID,
3737
"--label", labelK+"="+labelV,
38-
testutil.CommonImage, "sleep", "infinity").AssertOK()
38+
testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
3939
defer base.Cmd("rm", "-f", cID).AssertOK()
4040
base.Cmd("ps", "-a",
4141
"--filter", "label="+labelK,
@@ -53,7 +53,7 @@ func TestContainerListWithJsonFormatLabel(t *testing.T) {
5353
base.Cmd("run", "-d",
5454
"--name", cID,
5555
"--label", labelK+"="+labelV,
56-
testutil.CommonImage, "sleep", "infinity").AssertOK()
56+
testutil.CommonImage, "sleep", nerdtest.Infinity).AssertOK()
5757
defer base.Cmd("rm", "-f", cID).AssertOK()
5858
base.Cmd("ps", "-a",
5959
"--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: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,22 @@ 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) {
3535
helpers.Anyhow("rm", "-f", data.Identifier())
3636
}
3737

3838
testCase.Command = func(data test.Data, helpers test.Helpers) test.TestableCommand {
39-
helpers.Fail("rm", data.Identifier())
39+
containerID := data.Identifier()
40+
helpers.Fail("rm", containerID)
4041

4142
// FIXME: should (re-)evaluate this
4243
// `kill` seems to return before the container actually stops
43-
helpers.Ensure("stop", data.Identifier())
44+
helpers.Ensure("stop", containerID)
4445

45-
return helpers.Command("rm", data.Identifier())
46+
return helpers.Command("rm", containerID)
4647
}
4748

4849
testCase.Expected = test.Expects(0, nil, nil)

‎cmd/nerdctl/container/container_rename_linux_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestRename(t *testing.T) {
2828
base := testutil.NewBase(t)
2929

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

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

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

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

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

‎cmd/nerdctl/container/container_rename_windows_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestRenameProcessContainer(t *testing.T) {
2727
base := testutil.NewBase(t)
2828

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

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

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

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

0 commit comments

Comments
 (0)