Skip to content

Commit e710167

Browse files
apostasieapostasie
committed
Quiet ancillary image pulls
Signed-off-by: apostasie <[email protected]>
1 parent 320d5c3 commit e710167

10 files changed

+25
-25
lines changed

‎cmd/nerdctl/completion/completion_linux_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestCompletion(t *testing.T) {
3030
testCase := &test.Case{
3131
Require: test.Not(nerdtest.Docker),
3232
Setup: func(data test.Data, helpers test.Helpers) {
33-
helpers.Ensure("pull", testutil.AlpineImage)
33+
helpers.Ensure("pull", "--quiet", testutil.AlpineImage)
3434
helpers.Ensure("network", "create", data.Identifier())
3535
helpers.Ensure("volume", "create", data.Identifier())
3636
data.Set("identifier", data.Identifier())

‎cmd/nerdctl/image/image_convert_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestImageConvert(t *testing.T) {
3636
test.Not(nerdtest.Docker),
3737
),
3838
Setup: func(data test.Data, helpers test.Helpers) {
39-
helpers.Ensure("pull", testutil.CommonImage)
39+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
4040
},
4141
SubTests: []*test.Case{
4242
{
@@ -111,7 +111,7 @@ func TestImageConvertNydusVerify(t *testing.T) {
111111
nerdtest.Rootful,
112112
),
113113
Setup: func(data test.Data, helpers test.Helpers) {
114-
helpers.Ensure("pull", testutil.CommonImage)
114+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
115115
base := testutil.NewBase(t)
116116
registry = testregistry.NewWithNoAuth(base, 0, false)
117117
data.Set(remoteImageKey, fmt.Sprintf("%s:%d/nydusd-image:test", "localhost", registry.Port))

‎cmd/nerdctl/image/image_encrypt_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func TestImageEncryptJWE(t *testing.T) {
5757
base := testutil.NewBase(t)
5858
registry = testregistry.NewWithNoAuth(base, 0, false)
5959
keyPair = testhelpers.NewJWEKeyPair(t)
60-
helpers.Ensure("pull", testutil.CommonImage)
60+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
6161
encryptImageRef := fmt.Sprintf("127.0.0.1:%d/%s:encrypted", registry.Port, data.Identifier())
6262
helpers.Ensure("image", "encrypt", "--recipient=jwe:"+keyPair.Pub, testutil.CommonImage, encryptImageRef)
6363
inspector := helpers.Capture("image", "inspect", "--mode=native", "--format={{len .Index.Manifests}}", encryptImageRef)
@@ -71,7 +71,7 @@ func TestImageEncryptJWE(t *testing.T) {
7171
},
7272
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
7373
helpers.Fail("pull", data.Get(remoteImageKey))
74-
helpers.Ensure("pull", "--unpack=false", data.Get(remoteImageKey))
74+
helpers.Ensure("pull", "--quiet", "--unpack=false", data.Get(remoteImageKey))
7575
helpers.Fail("image", "decrypt", "--key="+keyPair.Pub, data.Get(remoteImageKey), data.Identifier("decrypted")) // decryption needs prv key, not pub key
7676
return helpers.Command("image", "decrypt", "--key="+keyPair.Prv, data.Get(remoteImageKey), data.Identifier("decrypted"))
7777
},

‎cmd/nerdctl/image/image_history_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ func TestImageHistory(t *testing.T) {
8181
// https://github.com/containerd/nerdctl/issues/3512
8282
// Isolating it into a completely different root is the last ditched attempt at avoiding the issue
8383
helpers.Write(nerdtest.DataRoot, test.ConfigValue(data.TempDir()))
84-
helpers.Ensure("pull", "--platform", "linux/arm64", testutil.CommonImage)
84+
helpers.Ensure("pull", "--quiet", "--platform", "linux/arm64", testutil.CommonImage)
8585
},
8686
SubTests: []*test.Case{
8787
{

‎cmd/nerdctl/image/image_inspect_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ func TestImageInspectDifferentValidReferencesForTheSameImage(t *testing.T) {
8787
nerdtest.Private,
8888
),
8989
Setup: func(data test.Data, helpers test.Helpers) {
90-
helpers.Ensure("pull", "alpine")
91-
helpers.Ensure("pull", "busybox")
92-
helpers.Ensure("pull", "registry-1.docker.io/library/busybox")
90+
helpers.Ensure("pull", "--quiet", "alpine")
91+
helpers.Ensure("pull", "--quiet", "busybox")
92+
helpers.Ensure("pull", "--quiet", "registry-1.docker.io/library/busybox")
9393
},
9494
SubTests: []*test.Case{
9595
{

‎cmd/nerdctl/image/image_list_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ func TestImages(t *testing.T) {
3838
Description: "TestImages",
3939
Require: test.Not(nerdtest.Docker),
4040
Setup: func(data test.Data, helpers test.Helpers) {
41-
helpers.Ensure("pull", testutil.CommonImage)
42-
helpers.Ensure("pull", testutil.NginxAlpineImage)
41+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
42+
helpers.Ensure("pull", "--quiet", testutil.NginxAlpineImage)
4343
},
4444
SubTests: []*test.Case{
4545
{
@@ -127,7 +127,7 @@ func TestImagesFilter(t *testing.T) {
127127
Description: "TestImagesFilter",
128128
Require: nerdtest.Build,
129129
Setup: func(data test.Data, helpers test.Helpers) {
130-
helpers.Ensure("pull", testutil.CommonImage)
130+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
131131
helpers.Ensure("tag", testutil.CommonImage, "taggedimage:one-fragment-one")
132132
helpers.Ensure("tag", testutil.CommonImage, "taggedimage:two-fragment-two")
133133

‎cmd/nerdctl/image/image_load_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestLoadStdinFromPipe(t *testing.T) {
3737
Description: "TestLoadStdinFromPipe",
3838
Require: test.Linux,
3939
Setup: func(data test.Data, helpers test.Helpers) {
40-
helpers.Ensure("pull", testutil.CommonImage)
40+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
4141
helpers.Ensure("tag", testutil.CommonImage, data.Identifier())
4242
helpers.Ensure("save", data.Identifier(), "-o", filepath.Join(data.TempDir(), "common.tar"))
4343
helpers.Ensure("rmi", "-f", data.Identifier())

‎cmd/nerdctl/image/image_push_linux_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestPush(t *testing.T) {
6464
{
6565
Description: "plain http",
6666
Setup: func(data test.Data, helpers test.Helpers) {
67-
helpers.Ensure("pull", testutil.CommonImage)
67+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
6868
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
6969
registryNoAuthHTTPRandom.IP.String(), registryNoAuthHTTPRandom.Port, data.Identifier(), strings.Split(testutil.CommonImage, ":")[1])
7070
data.Set("testImageRef", testImageRef)
@@ -84,7 +84,7 @@ func TestPush(t *testing.T) {
8484
Description: "plain http with insecure",
8585
Require: test.Not(nerdtest.Docker),
8686
Setup: func(data test.Data, helpers test.Helpers) {
87-
helpers.Ensure("pull", testutil.CommonImage)
87+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
8888
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
8989
registryNoAuthHTTPRandom.IP.String(), registryNoAuthHTTPRandom.Port, data.Identifier(), strings.Split(testutil.CommonImage, ":")[1])
9090
data.Set("testImageRef", testImageRef)
@@ -103,7 +103,7 @@ func TestPush(t *testing.T) {
103103
{
104104
Description: "plain http with localhost",
105105
Setup: func(data test.Data, helpers test.Helpers) {
106-
helpers.Ensure("pull", testutil.CommonImage)
106+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
107107
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
108108
"127.0.0.1", registryNoAuthHTTPRandom.Port, data.Identifier(), strings.Split(testutil.CommonImage, ":")[1])
109109
data.Set("testImageRef", testImageRef)
@@ -118,7 +118,7 @@ func TestPush(t *testing.T) {
118118
Description: "plain http with insecure, default port",
119119
Require: test.Not(nerdtest.Docker),
120120
Setup: func(data test.Data, helpers test.Helpers) {
121-
helpers.Ensure("pull", testutil.CommonImage)
121+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
122122
testImageRef := fmt.Sprintf("%s/%s:%s",
123123
registryNoAuthHTTPDefault.IP.String(), data.Identifier(), strings.Split(testutil.CommonImage, ":")[1])
124124
data.Set("testImageRef", testImageRef)
@@ -138,7 +138,7 @@ func TestPush(t *testing.T) {
138138
Description: "with insecure, with login",
139139
Require: test.Not(nerdtest.Docker),
140140
Setup: func(data test.Data, helpers test.Helpers) {
141-
helpers.Ensure("pull", testutil.CommonImage)
141+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
142142
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
143143
registryTokenAuthHTTPSRandom.IP.String(), registryTokenAuthHTTPSRandom.Port, data.Identifier(), strings.Split(testutil.CommonImage, ":")[1])
144144
data.Set("testImageRef", testImageRef)
@@ -161,7 +161,7 @@ func TestPush(t *testing.T) {
161161
Description: "with hosts dir, with login",
162162
Require: test.Not(nerdtest.Docker),
163163
Setup: func(data test.Data, helpers test.Helpers) {
164-
helpers.Ensure("pull", testutil.CommonImage)
164+
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
165165
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
166166
registryTokenAuthHTTPSRandom.IP.String(), registryTokenAuthHTTPSRandom.Port, data.Identifier(), strings.Split(testutil.CommonImage, ":")[1])
167167
data.Set("testImageRef", testImageRef)
@@ -184,7 +184,7 @@ func TestPush(t *testing.T) {
184184
Description: "non distributable artifacts",
185185
Require: test.Not(nerdtest.Docker),
186186
Setup: func(data test.Data, helpers test.Helpers) {
187-
helpers.Ensure("pull", testutil.NonDistBlobImage)
187+
helpers.Ensure("pull", "--quiet", testutil.NonDistBlobImage)
188188
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
189189
registryNoAuthHTTPRandom.IP.String(), registryNoAuthHTTPRandom.Port, data.Identifier(), strings.Split(testutil.NonDistBlobImage, ":")[1])
190190
data.Set("testImageRef", testImageRef)
@@ -216,7 +216,7 @@ func TestPush(t *testing.T) {
216216
Description: "non distributable artifacts (with)",
217217
Require: test.Not(nerdtest.Docker),
218218
Setup: func(data test.Data, helpers test.Helpers) {
219-
helpers.Ensure("pull", testutil.NonDistBlobImage)
219+
helpers.Ensure("pull", "--quiet", testutil.NonDistBlobImage)
220220
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
221221
registryNoAuthHTTPRandom.IP.String(), registryNoAuthHTTPRandom.Port, data.Identifier(), strings.Split(testutil.NonDistBlobImage, ":")[1])
222222
data.Set("testImageRef", testImageRef)
@@ -251,7 +251,7 @@ func TestPush(t *testing.T) {
251251
test.Not(nerdtest.Docker),
252252
),
253253
Setup: func(data test.Data, helpers test.Helpers) {
254-
helpers.Ensure("pull", testutil.UbuntuImage)
254+
helpers.Ensure("pull", "--quiet", testutil.UbuntuImage)
255255
testImageRef := fmt.Sprintf("%s:%d/%s:%s",
256256
registryNoAuthHTTPRandom.IP.String(), registryNoAuthHTTPRandom.Port, data.Identifier(), strings.Split(testutil.UbuntuImage, ":")[1])
257257
data.Set("testImageRef", testImageRef)

‎cmd/nerdctl/image/image_remove_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func TestRemove(t *testing.T) {
166166
NoParallel: true,
167167
Require: test.Not(test.Windows),
168168
Setup: func(data test.Data, helpers test.Helpers) {
169-
helpers.Ensure("pull", testutil.NginxAlpineImage)
169+
helpers.Ensure("pull", "--quiet", testutil.NginxAlpineImage)
170170
helpers.Ensure("create", "--pull", "always", "--name", data.Identifier(), testutil.CommonImage, "sleep", "infinity")
171171
helpers.Ensure("rmi", testutil.NginxAlpineImage)
172172
},

‎cmd/nerdctl/ipfs/ipfs_registry_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
8585
NoParallel: true,
8686
Setup: func(data test.Data, helpers test.Helpers) {
8787
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.AlpineImage))
88-
helpers.Ensure("pull", data.Get(ipfsImageURLKey))
88+
helpers.Ensure("pull", "--quiet", data.Get(ipfsImageURLKey))
8989
},
9090
Cleanup: func(data test.Data, helpers test.Helpers) {
9191
if data.Get(ipfsImageURLKey) != "" {
@@ -103,7 +103,7 @@ func TestIPFSNerdctlRegistry(t *testing.T) {
103103
Require: nerdtest.Stargz,
104104
Setup: func(data test.Data, helpers test.Helpers) {
105105
data.Set(ipfsImageURLKey, listenAddr+"/ipfs/"+pushToIPFS(helpers, testutil.AlpineImage, "--estargz"))
106-
helpers.Ensure("pull", data.Get(ipfsImageURLKey))
106+
helpers.Ensure("pull", "--quiet", data.Get(ipfsImageURLKey))
107107
},
108108
Cleanup: func(data test.Data, helpers test.Helpers) {
109109
if data.Get(ipfsImageURLKey) != "" {

0 commit comments

Comments
 (0)