Skip to content

Commit a4a7282

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #3547 from apostasie/qa-rmi-f
Consistently enforce rmi -f in tests cleanup
2 parents 96f9b01 + 496b2f0 commit a4a7282

10 files changed

+43
-43
lines changed

‎cmd/nerdctl/image/image_convert_linux_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestImageConvert(t *testing.T) {
4242
{
4343
Description: "esgz",
4444
Cleanup: func(data test.Data, helpers test.Helpers) {
45-
helpers.Anyhow("rmi", data.Identifier("converted-image"))
45+
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
4646
},
4747
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
4848
return helpers.Command("image", "convert", "--oci", "--estargz",
@@ -56,7 +56,7 @@ func TestImageConvert(t *testing.T) {
5656
test.Binary("nydus-image"),
5757
),
5858
Cleanup: func(data test.Data, helpers test.Helpers) {
59-
helpers.Anyhow("rmi", data.Identifier("converted-image"))
59+
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
6060
},
6161
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
6262
return helpers.Command("image", "convert", "--oci", "--nydus",
@@ -67,7 +67,7 @@ func TestImageConvert(t *testing.T) {
6767
{
6868
Description: "zstd",
6969
Cleanup: func(data test.Data, helpers test.Helpers) {
70-
helpers.Anyhow("rmi", data.Identifier("converted-image"))
70+
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
7171
},
7272
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
7373
return helpers.Command("image", "convert", "--oci", "--zstd", "--zstd-compression-level", "3",
@@ -78,7 +78,7 @@ func TestImageConvert(t *testing.T) {
7878
{
7979
Description: "zstdchunked",
8080
Cleanup: func(data test.Data, helpers test.Helpers) {
81-
helpers.Anyhow("rmi", data.Identifier("converted-image"))
81+
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
8282
},
8383
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
8484
return helpers.Command("image", "convert", "--oci", "--zstdchunked", "--zstdchunked-compression-level", "3",
@@ -120,10 +120,10 @@ func TestImageConvertNydusVerify(t *testing.T) {
120120
helpers.Ensure("push", data.Get(remoteImageKey))
121121
},
122122
Cleanup: func(data test.Data, helpers test.Helpers) {
123-
helpers.Anyhow("rmi", data.Identifier("converted-image"))
123+
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
124124
if registry != nil {
125125
registry.Cleanup(nil)
126-
helpers.Anyhow("rmi", data.Get(remoteImageKey))
126+
helpers.Anyhow("rmi", "-f", data.Get(remoteImageKey))
127127
}
128128
},
129129
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {

‎cmd/nerdctl/image/image_list_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ RUN echo "actually creating a layer so that docker sets the createdAt time"
141141
data.Set("buildCtx", buildCtx)
142142
},
143143
Cleanup: func(data test.Data, helpers test.Helpers) {
144-
helpers.Anyhow("rmi", "taggedimage:one-fragment-one")
145-
helpers.Anyhow("rmi", "taggedimage:two-fragment-two")
146-
helpers.Anyhow("rmi", data.Identifier())
144+
helpers.Anyhow("rmi", "-f", "taggedimage:one-fragment-one")
145+
helpers.Anyhow("rmi", "-f", "taggedimage:two-fragment-two")
146+
helpers.Anyhow("rmi", "-f", data.Identifier())
147147
},
148148
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
149149
data.Set("builtImageID", data.Identifier())

‎cmd/nerdctl/image/image_load_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestLoadStdinFromPipe(t *testing.T) {
4343
helpers.Ensure("rmi", "-f", data.Identifier())
4444
},
4545
Cleanup: func(data test.Data, helpers test.Helpers) {
46-
helpers.Anyhow("rmi", data.Identifier())
46+
helpers.Anyhow("rmi", "-f", data.Identifier())
4747
},
4848
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
4949
cmd := helpers.Command("load")

‎cmd/nerdctl/image/image_prune_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func TestImagePrune(t *testing.T) {
5353
nerdtest.Build,
5454
),
5555
Cleanup: func(data test.Data, helpers test.Helpers) {
56-
helpers.Anyhow("rmi", data.Identifier())
56+
helpers.Anyhow("rmi", "-f", data.Identifier())
5757
},
5858
Setup: func(data test.Data, helpers test.Helpers) {
5959
dockerfile := fmt.Sprintf(`FROM %s
@@ -95,7 +95,7 @@ func TestImagePrune(t *testing.T) {
9595
// Cannot use a custom namespace with buildkitd right now, so, no parallel it is
9696
NoParallel: true,
9797
Cleanup: func(data test.Data, helpers test.Helpers) {
98-
helpers.Anyhow("rmi", data.Identifier())
98+
helpers.Anyhow("rmi", "-f", data.Identifier())
9999
helpers.Anyhow("rm", "-f", data.Identifier())
100100
},
101101
Setup: func(data test.Data, helpers test.Helpers) {
@@ -138,7 +138,7 @@ func TestImagePrune(t *testing.T) {
138138
// Cannot use a custom namespace with buildkitd right now, so, no parallel it is
139139
NoParallel: true,
140140
Cleanup: func(data test.Data, helpers test.Helpers) {
141-
helpers.Anyhow("rmi", data.Identifier())
141+
helpers.Anyhow("rmi", "-f", data.Identifier())
142142
},
143143
Setup: func(data test.Data, helpers test.Helpers) {
144144
dockerfile := fmt.Sprintf(`FROM %s
@@ -177,7 +177,7 @@ LABEL version=0.1`, testutil.CommonImage)
177177
// Cannot use a custom namespace with buildkitd right now, so, no parallel it is
178178
NoParallel: true,
179179
Cleanup: func(data test.Data, helpers test.Helpers) {
180-
helpers.Anyhow("rmi", data.Identifier())
180+
helpers.Anyhow("rmi", "-f", data.Identifier())
181181
},
182182
Setup: func(data test.Data, helpers test.Helpers) {
183183
dockerfile := fmt.Sprintf(`FROM %s

‎cmd/nerdctl/image/image_pull_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func TestImagePullSoci(t *testing.T) {
176176
helpers.Ensure("--snapshotter=soci", "pull", testutil.FfmpegSociImage)
177177
},
178178
Cleanup: func(data test.Data, helpers test.Helpers) {
179-
helpers.Anyhow("rmi", testutil.FfmpegSociImage)
179+
helpers.Anyhow("rmi", "-f", testutil.FfmpegSociImage)
180180
},
181181
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
182182
return helpers.Custom("mount")
@@ -210,7 +210,7 @@ func TestImagePullSoci(t *testing.T) {
210210
helpers.Ensure("--snapshotter=soci", "pull", testutil.FfmpegSociImage)
211211
},
212212
Cleanup: func(data test.Data, helpers test.Helpers) {
213-
helpers.Anyhow("rmi", testutil.FfmpegSociImage)
213+
helpers.Anyhow("rmi", "-f", testutil.FfmpegSociImage)
214214
},
215215
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
216216
return helpers.Custom("mount")

‎cmd/nerdctl/image/image_push_linux_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func TestPush(t *testing.T) {
7272
},
7373
Cleanup: func(data test.Data, helpers test.Helpers) {
7474
if data.Get("testImageRef") != "" {
75-
helpers.Anyhow("rmi", data.Get("testImageRef"))
75+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
7676
}
7777
},
7878
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -92,7 +92,7 @@ func TestPush(t *testing.T) {
9292
},
9393
Cleanup: func(data test.Data, helpers test.Helpers) {
9494
if data.Get("testImageRef") != "" {
95-
helpers.Anyhow("rmi", data.Get("testImageRef"))
95+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
9696
}
9797
},
9898
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -126,7 +126,7 @@ func TestPush(t *testing.T) {
126126
},
127127
Cleanup: func(data test.Data, helpers test.Helpers) {
128128
if data.Get("testImageRef") != "" {
129-
helpers.Anyhow("rmi", data.Get("testImageRef"))
129+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
130130
}
131131
},
132132
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -149,7 +149,7 @@ func TestPush(t *testing.T) {
149149
},
150150
Cleanup: func(data test.Data, helpers test.Helpers) {
151151
if data.Get("testImageRef") != "" {
152-
helpers.Anyhow("rmi", data.Get("testImageRef"))
152+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
153153
}
154154
},
155155
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -172,7 +172,7 @@ func TestPush(t *testing.T) {
172172
},
173173
Cleanup: func(data test.Data, helpers test.Helpers) {
174174
if data.Get("testImageRef") != "" {
175-
helpers.Anyhow("rmi", data.Get("testImageRef"))
175+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
176176
}
177177
},
178178
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -192,7 +192,7 @@ func TestPush(t *testing.T) {
192192
},
193193
Cleanup: func(data test.Data, helpers test.Helpers) {
194194
if data.Get("testImageRef") != "" {
195-
helpers.Anyhow("rmi", data.Get("testImageRef"))
195+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
196196
}
197197
},
198198
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -224,7 +224,7 @@ func TestPush(t *testing.T) {
224224
},
225225
Cleanup: func(data test.Data, helpers test.Helpers) {
226226
if data.Get("testImageRef") != "" {
227-
helpers.Anyhow("rmi", data.Get("testImageRef"))
227+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
228228
}
229229
},
230230
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -259,7 +259,7 @@ func TestPush(t *testing.T) {
259259
},
260260
Cleanup: func(data test.Data, helpers test.Helpers) {
261261
if data.Get("testImageRef") != "" {
262-
helpers.Anyhow("rmi", data.Get("testImageRef"))
262+
helpers.Anyhow("rmi", "-f", data.Get("testImageRef"))
263263
}
264264
},
265265
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {

‎cmd/nerdctl/ipfs/ipfs_compose_linux_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ func TestIPFSCompNoBuild(t *testing.T) {
7272
ipfsRegistry.Cleanup(data, helpers)
7373
}
7474
// Speeding up repeat tests...
75-
helpers.Anyhow("rmi", testutil.WordpressImage)
76-
helpers.Anyhow("rmi", testutil.MariaDBImage)
75+
helpers.Anyhow("rmi", "-f", testutil.WordpressImage)
76+
helpers.Anyhow("rmi", "-f", testutil.MariaDBImage)
7777
}
7878

7979
testCase.Run(t)
@@ -127,8 +127,8 @@ func subtestTestIPFSCompNoB(t *testing.T, stargz bool, byAddr bool) *test.Case {
127127
// Deliberately electing to not remove them here so that we can parallelize and cut down the running time
128128
/*
129129
if data.Get(mariaImageCIDKey) != "" {
130-
helpers.Anyhow("rmi", data.Get(mariaImageCIDKey))
131-
helpers.Anyhow("rmi", data.Get(wordpressImageCIDKey))
130+
helpers.Anyhow("rmi", "-f", data.Get(mariaImageCIDKey))
131+
helpers.Anyhow("rmi", "-f", data.Get(wordpressImageCIDKey))
132132
}
133133
*/
134134
}
@@ -233,7 +233,7 @@ COPY index.html /usr/share/nginx/html/index.html
233233
testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
234234
if ipfsServer != nil {
235235
// Close the server once done
236-
helpers.Anyhow("rmi", data.Get(mainImageCIDKey))
236+
helpers.Anyhow("rmi", "-f", data.Get(mainImageCIDKey))
237237
ipfsServer.Run(nil)
238238
}
239239
if comp != nil {

‎cmd/nerdctl/ipfs/ipfs_kubo_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestIPFSAddrWithKubo(t *testing.T) {
6868
},
6969
Cleanup: func(data test.Data, helpers test.Helpers) {
7070
if data.Get(mainImageCIDKey) != "" {
71-
helpers.Anyhow("rmi", data.Get(mainImageCIDKey))
71+
helpers.Anyhow("rmi", "-f", data.Get(mainImageCIDKey))
7272
}
7373
},
7474
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -91,7 +91,7 @@ func TestIPFSAddrWithKubo(t *testing.T) {
9191
},
9292
Cleanup: func(data test.Data, helpers test.Helpers) {
9393
if data.Get(mainImageCIDKey) != "" {
94-
helpers.Anyhow("rmi", data.Get(mainImageCIDKey))
94+
helpers.Anyhow("rmi", "-f", data.Get(mainImageCIDKey))
9595
}
9696
},
9797
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {

‎cmd/nerdctl/ipfs/ipfs_registry_linux_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
8989
},
9090
Cleanup: func(data test.Data, helpers test.Helpers) {
9191
if data.Get(ipfsImageURLKey) != "" {
92-
helpers.Anyhow("rmi", data.Get(ipfsImageURLKey))
92+
helpers.Anyhow("rmi", "-f", data.Get(ipfsImageURLKey))
9393
}
9494
},
9595
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -107,7 +107,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
107107
},
108108
Cleanup: func(data test.Data, helpers test.Helpers) {
109109
if data.Get(ipfsImageURLKey) != "" {
110-
helpers.Anyhow("rmi", data.Get(ipfsImageURLKey))
110+
helpers.Anyhow("rmi", "-f", data.Get(ipfsImageURLKey))
111111
}
112112
},
113113
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -120,9 +120,9 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
120120
NoParallel: true,
121121
Require: nerdtest.Build,
122122
Cleanup: func(data test.Data, helpers test.Helpers) {
123-
helpers.Anyhow("rmi", data.Identifier("built-image"))
123+
helpers.Anyhow("rmi", "-f", data.Identifier("built-image"))
124124
if data.Get(ipfsImageURLKey) != "" {
125-
helpers.Anyhow("rmi", data.Get(ipfsImageURLKey))
125+
helpers.Anyhow("rmi", "-f", data.Get(ipfsImageURLKey))
126126
}
127127
},
128128
Setup: func(data test.Data, helpers test.Helpers) {

‎cmd/nerdctl/ipfs/ipfs_simple_linux_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestIPFSSimple(t *testing.T) {
5555
},
5656
Cleanup: func(data test.Data, helpers test.Helpers) {
5757
if data.Get(mainImageCIDKey) != "" {
58-
helpers.Anyhow("rmi", data.Get(mainImageCIDKey))
58+
helpers.Anyhow("rmi", "-f", data.Get(mainImageCIDKey))
5959
}
6060
},
6161
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -76,7 +76,7 @@ func TestIPFSSimple(t *testing.T) {
7676
},
7777
Cleanup: func(data test.Data, helpers test.Helpers) {
7878
if data.Get(mainImageCIDKey) != "" {
79-
helpers.Anyhow("rmi", data.Get(mainImageCIDKey))
79+
helpers.Anyhow("rmi", "-f", data.Get(mainImageCIDKey))
8080
}
8181
},
8282
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
@@ -105,10 +105,10 @@ func TestIPFSSimple(t *testing.T) {
105105
},
106106
Cleanup: func(data test.Data, helpers test.Helpers) {
107107
helpers.Anyhow("rm", data.Identifier("commit-container"))
108-
helpers.Anyhow("rmi", data.Identifier("commit-image"))
108+
helpers.Anyhow("rmi", "-f", data.Identifier("commit-image"))
109109
if data.Get(mainImageCIDKey) != "" {
110-
helpers.Anyhow("rmi", data.Get(mainImageCIDKey))
111-
helpers.Anyhow("rmi", data.Get(transformedImageCIDKey))
110+
helpers.Anyhow("rmi", "-f", data.Get(mainImageCIDKey))
111+
helpers.Anyhow("rmi", "-f", data.Get(transformedImageCIDKey))
112112
}
113113
},
114114

@@ -143,10 +143,10 @@ func TestIPFSSimple(t *testing.T) {
143143
},
144144
Cleanup: func(data test.Data, helpers test.Helpers) {
145145
helpers.Anyhow("rm", data.Identifier("commit-container"))
146-
helpers.Anyhow("rmi", data.Identifier("commit-image"))
146+
helpers.Anyhow("rmi", "-f", data.Identifier("commit-image"))
147147
if data.Get(mainImageCIDKey) != "" {
148-
helpers.Anyhow("rmi", data.Get(mainImageCIDKey))
149-
helpers.Anyhow("rmi", data.Get(transformedImageCIDKey))
148+
helpers.Anyhow("rmi", "-f", data.Get(mainImageCIDKey))
149+
helpers.Anyhow("rmi", "-f", data.Get(transformedImageCIDKey))
150150
}
151151
},
152152

0 commit comments

Comments
 (0)