Skip to content

Commit bdc0076

Browse files
apostasieapostasie
committed
Reduce calls to data.Identifier()
Signed-off-by: apostasie <[email protected]>
1 parent 47f1a6b commit bdc0076

11 files changed

+81
-57
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", "Inf").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 & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,48 +32,54 @@ 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", "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) {
65+
identifier := data.Identifier()
6166
// See note above about docker failing.
6267
if nerdtest.IsDocker() {
6368
helpers.Ensure("pull", testutil.CommonImage)
6469
}
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`)
70+
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "sleep", "infinity")
71+
nerdtest.EnsureContainerStarted(helpers, identifier)
72+
helpers.Ensure("exec", identifier, "sh", "-euxc", `echo hello-test-commit > /foo`)
6873
},
6974
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
75+
identifier := data.Identifier()
7076
helpers.Ensure(
7177
"commit",
7278
"-c", `CMD ["/foo"]`,
7379
"-c", `ENTRYPOINT ["cat"]`,
7480
"--pause=false",
75-
data.Identifier(), data.Identifier())
76-
return helpers.Command("run", "--rm", data.Identifier())
81+
identifier, identifier)
82+
return helpers.Command("run", "--rm", identifier)
7783
},
7884
Expected: test.Expects(0, nil, test.Equals("hello-test-commit\n")),
7985
},

‎cmd/nerdctl/container/container_remove_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,14 @@ func TestRemoveContainer(t *testing.T) {
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/image/image_load_test.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ func TestLoadStdinFromPipe(t *testing.T) {
3737
Description: "TestLoadStdinFromPipe",
3838
Require: test.Linux,
3939
Setup: func(data test.Data, helpers test.Helpers) {
40+
identifier := data.Identifier()
4041
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
41-
helpers.Ensure("tag", testutil.CommonImage, data.Identifier())
42-
helpers.Ensure("save", data.Identifier(), "-o", filepath.Join(data.TempDir(), "common.tar"))
43-
helpers.Ensure("rmi", "-f", data.Identifier())
42+
helpers.Ensure("tag", testutil.CommonImage, identifier)
43+
helpers.Ensure("save", identifier, "-o", filepath.Join(data.TempDir(), "common.tar"))
44+
helpers.Ensure("rmi", "-f", identifier)
4445
},
4546
Cleanup: func(data test.Data, helpers test.Helpers) {
4647
helpers.Anyhow("rmi", "-f", data.Identifier())
@@ -53,11 +54,12 @@ func TestLoadStdinFromPipe(t *testing.T) {
5354
return cmd
5455
},
5556
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
57+
identifier := data.Identifier()
5658
return &test.Expected{
5759
Output: test.All(
58-
test.Contains(fmt.Sprintf("Loaded image: %s:latest", data.Identifier())),
60+
test.Contains(fmt.Sprintf("Loaded image: %s:latest", identifier)),
5961
func(stdout string, info string, t *testing.T) {
60-
assert.Assert(t, strings.Contains(helpers.Capture("images"), data.Identifier()))
62+
assert.Assert(t, strings.Contains(helpers.Capture("images"), identifier))
6163
},
6264
),
6365
}
@@ -86,10 +88,11 @@ func TestLoadQuiet(t *testing.T) {
8688
testCase := &test.Case{
8789
Description: "TestLoadQuiet",
8890
Setup: func(data test.Data, helpers test.Helpers) {
91+
identifier := data.Identifier()
8992
helpers.Ensure("pull", testutil.CommonImage)
90-
helpers.Ensure("tag", testutil.CommonImage, data.Identifier())
91-
helpers.Ensure("save", data.Identifier(), "-o", filepath.Join(data.TempDir(), "common.tar"))
92-
helpers.Ensure("rmi", "-f", data.Identifier())
93+
helpers.Ensure("tag", testutil.CommonImage, identifier)
94+
helpers.Ensure("save", identifier, "-o", filepath.Join(data.TempDir(), "common.tar"))
95+
helpers.Ensure("rmi", "-f", identifier)
9396
},
9497
Cleanup: func(data test.Data, helpers test.Helpers) {
9598
helpers.Anyhow("rmi", "-f", data.Identifier())

‎cmd/nerdctl/image/image_prune_test.go

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ func TestImagePrune(t *testing.T) {
5656
helpers.Anyhow("rmi", "-f", data.Identifier())
5757
},
5858
Setup: func(data test.Data, helpers test.Helpers) {
59+
identifier := data.Identifier()
5960
dockerfile := fmt.Sprintf(`FROM %s
6061
CMD ["echo", "nerdctl-test-image-prune"]
6162
`, testutil.CommonImage)
@@ -64,22 +65,23 @@ func TestImagePrune(t *testing.T) {
6465
helpers.Ensure("build", buildCtx)
6566
// After we rebuild with tag, docker will no longer show the <none> version from above
6667
// Swapping order does not change anything.
67-
helpers.Ensure("build", "-t", data.Identifier(), buildCtx)
68+
helpers.Ensure("build", "-t", identifier, buildCtx)
6869
imgList := helpers.Capture("images")
6970
assert.Assert(t, strings.Contains(imgList, "<none>"), "Missing <none>")
70-
assert.Assert(t, strings.Contains(imgList, data.Identifier()), "Missing "+data.Identifier())
71+
assert.Assert(t, strings.Contains(imgList, identifier), "Missing "+identifier)
7172
},
7273
Command: test.Command("image", "prune", "--force"),
7374
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
75+
identifier := data.Identifier()
7476
return &test.Expected{
7577
Output: test.All(
7678
func(stdout string, info string, t *testing.T) {
77-
assert.Assert(t, !strings.Contains(stdout, data.Identifier()), info)
79+
assert.Assert(t, !strings.Contains(stdout, identifier), info)
7880
},
7981
func(stdout string, info string, t *testing.T) {
8082
imgList := helpers.Capture("images")
8183
assert.Assert(t, !strings.Contains(imgList, "<none>"), imgList)
82-
assert.Assert(t, strings.Contains(imgList, data.Identifier()), info)
84+
assert.Assert(t, strings.Contains(imgList, identifier), info)
8385
},
8486
),
8587
}
@@ -95,21 +97,23 @@ func TestImagePrune(t *testing.T) {
9597
// Cannot use a custom namespace with buildkitd right now, so, no parallel it is
9698
NoParallel: true,
9799
Cleanup: func(data test.Data, helpers test.Helpers) {
98-
helpers.Anyhow("rmi", "-f", data.Identifier())
99-
helpers.Anyhow("rm", "-f", data.Identifier())
100+
identifier := data.Identifier()
101+
helpers.Anyhow("rmi", "-f", identifier)
102+
helpers.Anyhow("rm", "-f", identifier)
100103
},
101104
Setup: func(data test.Data, helpers test.Helpers) {
105+
identifier := data.Identifier()
102106
dockerfile := fmt.Sprintf(`FROM %s
103107
CMD ["echo", "nerdctl-test-image-prune"]
104108
`, testutil.CommonImage)
105109

106110
buildCtx := testhelpers.CreateBuildContext(t, dockerfile)
107111
helpers.Ensure("build", buildCtx)
108-
helpers.Ensure("build", "-t", data.Identifier(), buildCtx)
112+
helpers.Ensure("build", "-t", identifier, buildCtx)
109113
imgList := helpers.Capture("images")
110114
assert.Assert(t, strings.Contains(imgList, "<none>"), "Missing <none>")
111-
assert.Assert(t, strings.Contains(imgList, data.Identifier()), "Missing "+data.Identifier())
112-
helpers.Ensure("run", "--name", data.Identifier(), data.Identifier())
115+
assert.Assert(t, strings.Contains(imgList, identifier), "Missing "+identifier)
116+
helpers.Ensure("run", "--name", identifier, identifier)
113117
},
114118
Command: test.Command("image", "prune", "--force", "--all"),
115119
Expected: func(data test.Data, helpers test.Helpers) *test.Expected {

‎cmd/nerdctl/issues/issues_linux_test.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,17 @@ func TestIssue3425(t *testing.T) {
4949
Description: "with tag",
5050
Require: nerdtest.Private,
5151
Setup: func(data test.Data, helpers test.Helpers) {
52+
identifier := data.Identifier()
5253
helpers.Ensure("image", "pull", testutil.CommonImage)
53-
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage)
54+
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage)
5455
helpers.Ensure("image", "rm", "-f", testutil.CommonImage)
5556
helpers.Ensure("image", "pull", testutil.CommonImage)
56-
helpers.Ensure("tag", testutil.CommonImage, fmt.Sprintf("localhost:%d/%s", reg.Port, data.Identifier()))
57+
helpers.Ensure("tag", testutil.CommonImage, fmt.Sprintf("localhost:%d/%s", reg.Port, identifier))
5758
},
5859
Cleanup: func(data test.Data, helpers test.Helpers) {
59-
helpers.Anyhow("rm", "-f", data.Identifier())
60-
helpers.Anyhow("rmi", "-f", fmt.Sprintf("localhost:%d/%s", reg.Port, data.Identifier()))
60+
identifier := data.Identifier()
61+
helpers.Anyhow("rm", "-f", identifier)
62+
helpers.Anyhow("rmi", "-f", fmt.Sprintf("localhost:%d/%s", reg.Port, identifier))
6163
},
6264
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
6365
return helpers.Command("push", fmt.Sprintf("localhost:%d/%s", reg.Port, data.Identifier()))
@@ -68,11 +70,12 @@ func TestIssue3425(t *testing.T) {
6870
Description: "with commit",
6971
Require: nerdtest.Private,
7072
Setup: func(data test.Data, helpers test.Helpers) {
73+
identifier := data.Identifier()
7174
helpers.Ensure("image", "pull", testutil.CommonImage)
72-
helpers.Ensure("run", "-d", "--name", data.Identifier(), testutil.CommonImage, "touch", "/something")
75+
helpers.Ensure("run", "-d", "--name", identifier, testutil.CommonImage, "touch", "/something")
7376
helpers.Ensure("image", "rm", "-f", testutil.CommonImage)
7477
helpers.Ensure("image", "pull", testutil.CommonImage)
75-
helpers.Ensure("commit", data.Identifier(), fmt.Sprintf("localhost:%d/%s", reg.Port, data.Identifier()))
78+
helpers.Ensure("commit", identifier, fmt.Sprintf("localhost:%d/%s", reg.Port, identifier))
7679
},
7780
Cleanup: func(data test.Data, helpers test.Helpers) {
7881
helpers.Anyhow("rm", "-f", data.Identifier())

‎cmd/nerdctl/network/network_create_linux_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ func TestNetworkCreate(t *testing.T) {
3636
{
3737
Description: "vanilla",
3838
Setup: func(data test.Data, helpers test.Helpers) {
39-
helpers.Ensure("network", "create", data.Identifier())
40-
netw := nerdtest.InspectNetwork(helpers, data.Identifier())
39+
identifier := data.Identifier()
40+
helpers.Ensure("network", "create", identifier)
41+
netw := nerdtest.InspectNetwork(helpers, identifier)
4142
assert.Equal(t, len(netw.IPAM.Config), 1)
4243
data.Set("subnet", netw.IPAM.Config[0].Subnet)
4344

‎cmd/nerdctl/network/network_inspect_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,9 @@ func TestNetworkInspect(t *testing.T) {
200200
Description: "with namespace",
201201
Require: test.Not(nerdtest.Docker),
202202
Cleanup: func(data test.Data, helpers test.Helpers) {
203-
helpers.Anyhow("network", "rm", data.Identifier())
204-
helpers.Anyhow("namespace", "remove", data.Identifier())
203+
identifier := data.Identifier()
204+
helpers.Anyhow("network", "rm", identifier)
205+
helpers.Anyhow("namespace", "remove", identifier)
205206
},
206207
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
207208
return helpers.Command("network", "create", data.Identifier())

‎cmd/nerdctl/network/network_prune_linux_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ func TestNetworkPrune(t *testing.T) {
3434
Description: "Prune does not collect started container network",
3535
NoParallel: true,
3636
Setup: func(data test.Data, helpers test.Helpers) {
37-
helpers.Ensure("network", "create", data.Identifier())
38-
helpers.Ensure("run", "-d", "--net", data.Identifier(), "--name", data.Identifier(), testutil.NginxAlpineImage)
37+
identifier := data.Identifier()
38+
helpers.Ensure("network", "create", identifier)
39+
helpers.Ensure("run", "-d", "--net", identifier, "--name", identifier, testutil.NginxAlpineImage)
3940
},
4041
Cleanup: func(data test.Data, helpers test.Helpers) {
4142
helpers.Anyhow("rm", "-f", data.Identifier())

0 commit comments

Comments
 (0)