Skip to content

Commit 40bdc2b

Browse files
apostasieapostasie
committed
Move from Alpine to Common for compose tests
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
1 parent b5fa00b commit 40bdc2b

File tree

7 files changed

+33
-31
lines changed

7 files changed

+33
-31
lines changed

‎cmd/nerdctl/compose/compose_build_linux_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
)
3030

3131
func TestComposeBuild(t *testing.T) {
32-
dockerfile := "FROM " + testutil.AlpineImage
32+
dockerfile := "FROM " + testutil.CommonImage
3333

3434
testCase := nerdtest.Setup()
3535

‎cmd/nerdctl/compose/compose_config_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ import (
2525
"github.com/containerd/nerdctl/mod/tigron/expect"
2626
"github.com/containerd/nerdctl/mod/tigron/test"
2727

28+
"github.com/containerd/nerdctl/v2/pkg/testutil"
2829
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
2930
)
3031

3132
func TestComposeConfig(t *testing.T) {
32-
const dockerComposeYAML = `
33+
dockerComposeYAML := fmt.Sprintf(`
3334
services:
3435
hello:
35-
image: alpine:3.13
36-
`
36+
image: %s
37+
`, testutil.CommonImage)
38+
3739
testCase := nerdtest.Setup()
3840

3941
testCase.Setup = func(data test.Data, helpers test.Helpers) {

‎cmd/nerdctl/compose/compose_create_linux_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestComposeCreate(t *testing.T) {
3535
services:
3636
svc0:
3737
image: %s
38-
`, testutil.AlpineImage)
38+
`, testutil.CommonImage)
3939

4040
testCase := nerdtest.Setup()
4141

@@ -151,7 +151,7 @@ func TestComposeCreatePull(t *testing.T) {
151151
services:
152152
svc0:
153153
image: %s
154-
`, testutil.AlpineImage)
154+
`, testutil.CommonImage)
155155

156156
comp := testutil.NewComposeDir(t, dockerComposeYAML)
157157
defer comp.CleanUp()
@@ -161,12 +161,12 @@ services:
161161
defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").AssertOK()
162162

163163
// `compose create --pull never` should fail: no such image
164-
base.Cmd("rmi", "-f", testutil.AlpineImage).Run()
164+
base.Cmd("rmi", "-f", testutil.CommonImage).Run()
165165
base.ComposeCmd("-f", comp.YAMLFullPath(), "create", "--pull", "never").AssertFail()
166166
// `compose create --pull missing(default)|always` should succeed: image is pulled and container is created
167-
base.Cmd("rmi", "-f", testutil.AlpineImage).Run()
167+
base.Cmd("rmi", "-f", testutil.CommonImage).Run()
168168
base.ComposeCmd("-f", comp.YAMLFullPath(), "create").AssertOK()
169-
base.Cmd("rmi", "-f", testutil.AlpineImage).Run()
169+
base.Cmd("rmi", "-f", testutil.CommonImage).Run()
170170
base.ComposeCmd("-f", comp.YAMLFullPath(), "create", "--pull", "always").AssertOK()
171171
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "svc0", "-a").AssertOutContainsAny("Created", "created")
172172
}
@@ -181,7 +181,7 @@ services:
181181
image: %s
182182
`, imageSvc0)
183183

184-
dockerfile := fmt.Sprintf(`FROM %s`, testutil.AlpineImage)
184+
dockerfile := fmt.Sprintf(`FROM %s`, testutil.CommonImage)
185185

186186
testutil.RequiresBuild(t)
187187
testutil.RegisterBuildCacheCleanup(t)

‎cmd/nerdctl/compose/compose_down_linux_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ services:
3434
test:
3535
image: %s
3636
command: "sleep infinity"
37-
`, testutil.AlpineImage)
37+
`, testutil.CommonImage)
3838

3939
dockerComposeYAMLFull = fmt.Sprintf(`
4040
%s
4141
orphan:
4242
image: %s
4343
command: "sleep infinity"
44-
`, dockerComposeYAMLOrphan, testutil.AlpineImage)
44+
`, dockerComposeYAMLOrphan, testutil.CommonImage)
4545
)
4646

4747
compOrphan := testutil.NewComposeDir(t, dockerComposeYAMLOrphan)
@@ -68,14 +68,14 @@ services:
6868
test:
6969
image: %s
7070
command: "sleep infinity"
71-
`, testutil.AlpineImage)
71+
`, testutil.CommonImage)
7272

7373
dockerComposeYAMLFull = fmt.Sprintf(`
7474
%s
7575
orphan:
7676
image: %s
7777
command: "sleep infinity"
78-
`, dockerComposeYAMLOrphan, testutil.AlpineImage)
78+
`, dockerComposeYAMLOrphan, testutil.CommonImage)
7979
)
8080

8181
compOrphan := testutil.NewComposeDir(t, dockerComposeYAMLOrphan)

‎cmd/nerdctl/compose/compose_ps_linux_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
volumes:
6363
wordpress:
6464
db:
65-
`, testutil.WordpressImage, testutil.MariaDBImage, testutil.AlpineImage)
65+
`, testutil.WordpressImage, testutil.MariaDBImage, testutil.CommonImage)
6666
comp := testutil.NewComposeDir(t, dockerComposeYAML)
6767
defer comp.CleanUp()
6868
projectName := comp.ProjectName()
@@ -98,9 +98,9 @@ volumes:
9898
time.Sleep(3 * time.Second)
9999
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "wordpress").AssertOutWithFunc(assertHandler("wordpress_container", testutil.WordpressImage))
100100
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "db").AssertOutWithFunc(assertHandler("db_container", testutil.MariaDBImage))
101-
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps").AssertOutNotContains(testutil.AlpineImage)
102-
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "alpine", "-a").AssertOutWithFunc(assertHandler("alpine_container", testutil.AlpineImage))
103-
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-a", "--filter", "status=exited").AssertOutWithFunc(assertHandler("alpine_container", testutil.AlpineImage))
101+
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps").AssertOutNotContains(testutil.CommonImage)
102+
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "alpine", "-a").AssertOutWithFunc(assertHandler("alpine_container", testutil.CommonImage))
103+
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-a", "--filter", "status=exited").AssertOutWithFunc(assertHandler("alpine_container", testutil.CommonImage))
104104
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "--services", "-a").AssertOutContainsAll("wordpress\n", "db\n", "alpine\n")
105105
}
106106

‎cmd/nerdctl/compose/compose_run_linux_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ services:
4545
image: %s
4646
entrypoint:
4747
- stty
48-
`, testutil.AlpineImage)
48+
`, testutil.CommonImage)
4949

5050
testCase := nerdtest.Setup()
5151

@@ -246,7 +246,7 @@ services:
246246
- sh
247247
- -c
248248
- "echo $$FOO"
249-
`, testutil.AlpineImage)
249+
`, testutil.CommonImage)
250250

251251
comp := testutil.NewComposeDir(t, dockerComposeYAML)
252252
defer comp.CleanUp()
@@ -276,7 +276,7 @@ services:
276276
entrypoint:
277277
- id
278278
- -u
279-
`, testutil.AlpineImage)
279+
`, testutil.CommonImage)
280280

281281
comp := testutil.NewComposeDir(t, dockerComposeYAML)
282282
defer comp.CleanUp()
@@ -306,7 +306,7 @@ services:
306306
- "dummy log"
307307
labels:
308308
- "foo=bar"
309-
`, testutil.AlpineImage)
309+
`, testutil.CommonImage)
310310

311311
comp := testutil.NewComposeDir(t, dockerComposeYAML)
312312
defer comp.CleanUp()
@@ -340,7 +340,7 @@ services:
340340
image: %s
341341
entrypoint:
342342
- echo
343-
`, testutil.AlpineImage)
343+
`, testutil.CommonImage)
344344

345345
comp := testutil.NewComposeDir(t, dockerComposeYAML)
346346
defer comp.CleanUp()
@@ -369,7 +369,7 @@ services:
369369
image: %s
370370
entrypoint:
371371
- stty # should be changed
372-
`, testutil.AlpineImage)
372+
`, testutil.CommonImage)
373373

374374
comp := testutil.NewComposeDir(t, dockerComposeYAML)
375375
defer comp.CleanUp()
@@ -396,7 +396,7 @@ services:
396396
image: %s
397397
entrypoint:
398398
- stty # no meaning, just put any command
399-
`, testutil.AlpineImage)
399+
`, testutil.CommonImage)
400400

401401
comp := testutil.NewComposeDir(t, dockerComposeYAML)
402402
defer comp.CleanUp()
@@ -480,7 +480,7 @@ services:
480480
`, imageSvc0, keyPair.PublicKey, keyPair.PrivateKey,
481481
imageSvc1, keyPair.PrivateKey, imageSvc2)
482482

483-
dockerfile := fmt.Sprintf(`FROM %s`, testutil.AlpineImage)
483+
dockerfile := fmt.Sprintf(`FROM %s`, testutil.CommonImage)
484484

485485
comp := testutil.NewComposeDir(t, dockerComposeYAML)
486486
defer comp.CleanUp()

‎cmd/nerdctl/compose/compose_up_linux_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ services:
276276
test:
277277
image: %s
278278
command: "sleep infinity"
279-
`, testutil.AlpineImage)
279+
`, testutil.CommonImage)
280280

281281
comp := testutil.NewComposeDir(t, dockerComposeYAML)
282282
defer comp.CleanUp()
@@ -303,7 +303,7 @@ networks:
303303
ipam:
304304
config:
305305
- subnet: 10.1.100.0/24
306-
`, testutil.AlpineImage)
306+
`, testutil.CommonImage)
307307

308308
comp := testutil.NewComposeDir(t, dockerComposeYAML)
309309
defer comp.CleanUp()
@@ -325,14 +325,14 @@ services:
325325
test:
326326
image: %s
327327
command: "sleep infinity"
328-
`, testutil.AlpineImage)
328+
`, testutil.CommonImage)
329329

330330
dockerComposeYAMLFull = fmt.Sprintf(`
331331
%s
332332
orphan:
333333
image: %s
334334
command: "sleep infinity"
335-
`, dockerComposeYAMLOrphan, testutil.AlpineImage)
335+
`, dockerComposeYAMLOrphan, testutil.CommonImage)
336336
)
337337

338338
compOrphan := testutil.NewComposeDir(t, dockerComposeYAMLOrphan)
@@ -361,7 +361,7 @@ services:
361361
test:
362362
image: %s
363363
command: "sleep infinity"
364-
`, testutil.AlpineImage)
364+
`, testutil.CommonImage)
365365

366366
comp := testutil.NewComposeDir(t, dockerComposeYAML)
367367
defer comp.CleanUp()

0 commit comments

Comments
 (0)