Skip to content

Commit 1d88823

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request containerd#4266 from apostasie/2025-05-more-tests
[CI] more tests cleanup
2 parents 2a2834d + 01c83c7 commit 1d88823

16 files changed

+41
-118
lines changed

‎cmd/nerdctl/compose/compose_build_linux_test.go‎

Lines changed: 1 addition & 3 deletions
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

@@ -51,8 +51,6 @@ services:
5151
svc1:
5252
build: .
5353
image: %s
54-
ports:
55-
- 8081:80
5654
`, imageSvc0, imageSvc1)
5755

5856
data.Temp().Save(dockerComposeYAML, "compose.yaml")

‎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_cp_linux_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ import (
3131

3232
func TestComposeCopy(t *testing.T) {
3333
var dockerComposeYAML = fmt.Sprintf(`
34-
version: '3.1'
35-
3634
services:
3735
svc0:
3836
image: %s

‎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 & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,18 @@ func TestComposeDownRemoveUsedNetwork(t *testing.T) {
3030

3131
var (
3232
dockerComposeYAMLOrphan = fmt.Sprintf(`
33-
version: '3.1'
34-
3533
services:
3634
test:
3735
image: %s
3836
command: "sleep infinity"
39-
`, testutil.AlpineImage)
37+
`, testutil.CommonImage)
4038

4139
dockerComposeYAMLFull = fmt.Sprintf(`
4240
%s
4341
orphan:
4442
image: %s
4543
command: "sleep infinity"
46-
`, dockerComposeYAMLOrphan, testutil.AlpineImage)
44+
`, dockerComposeYAMLOrphan, testutil.CommonImage)
4745
)
4846

4947
compOrphan := testutil.NewComposeDir(t, dockerComposeYAMLOrphan)
@@ -66,20 +64,18 @@ func TestComposeDownRemoveOrphans(t *testing.T) {
6664

6765
var (
6866
dockerComposeYAMLOrphan = fmt.Sprintf(`
69-
version: '3.1'
70-
7167
services:
7268
test:
7369
image: %s
7470
command: "sleep infinity"
75-
`, testutil.AlpineImage)
71+
`, testutil.CommonImage)
7672

7773
dockerComposeYAMLFull = fmt.Sprintf(`
7874
%s
7975
orphan:
8076
image: %s
8177
command: "sleep infinity"
82-
`, dockerComposeYAMLOrphan, testutil.AlpineImage)
78+
`, dockerComposeYAMLOrphan, testutil.CommonImage)
8379
)
8480

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

‎cmd/nerdctl/compose/compose_exec_linux_test.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ import (
3434

3535
func TestComposeExec(t *testing.T) {
3636
dockerComposeYAML := fmt.Sprintf(`
37-
version: '3.1'
38-
3937
services:
4038
svc0:
4139
image: %s
@@ -179,8 +177,6 @@ services:
179177
func TestComposeExecTTY(t *testing.T) {
180178
const expectedOutput = "speed 38400 baud"
181179
dockerComposeYAML := fmt.Sprintf(`
182-
version: '3.1'
183-
184180
services:
185181
svc0:
186182
image: %s
@@ -267,8 +263,6 @@ services:
267263

268264
func TestComposeExecWithIndex(t *testing.T) {
269265
dockerComposeYAML := fmt.Sprintf(`
270-
version: '3.1'
271-
272266
services:
273267
svc0:
274268
image: %s

‎cmd/nerdctl/compose/compose_kill_linux_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,10 @@ import (
2727
func TestComposeKill(t *testing.T) {
2828
base := testutil.NewBase(t)
2929
var dockerComposeYAML = fmt.Sprintf(`
30-
version: '3.1'
31-
3230
services:
3331
3432
wordpress:
3533
image: %s
36-
ports:
37-
- 8080:80
3834
environment:
3935
WORDPRESS_DB_HOST: db
4036
WORDPRESS_DB_USER: exampleuser

‎cmd/nerdctl/compose/compose_pause_linux_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ func TestComposePauseAndUnpause(t *testing.T) {
3131
}
3232

3333
var dockerComposeYAML = fmt.Sprintf(`
34-
version: '3.1'
35-
3634
services:
3735
svc0:
3836
image: %s

‎cmd/nerdctl/compose/compose_port_linux_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ func TestComposePort(t *testing.T) {
2727
base := testutil.NewBase(t)
2828

2929
var dockerComposeYAML = fmt.Sprintf(`
30-
version: '3.1'
31-
3230
services:
3331
svc0:
3432
image: %s
@@ -55,8 +53,6 @@ func TestComposePortFailure(t *testing.T) {
5553
base := testutil.NewBase(t)
5654

5755
var dockerComposeYAML = fmt.Sprintf(`
58-
version: '3.1'
59-
6056
services:
6157
svc0:
6258
image: %s

‎cmd/nerdctl/compose/compose_ps_linux_test.go‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,10 @@ import (
3232
func TestComposePs(t *testing.T) {
3333
base := testutil.NewBase(t)
3434
var dockerComposeYAML = fmt.Sprintf(`
35-
version: '3.1'
36-
3735
services:
3836
wordpress:
3937
image: %s
4038
container_name: wordpress_container
41-
ports:
42-
- 8080:80
4339
environment:
4440
WORDPRESS_DB_HOST: db
4541
WORDPRESS_DB_USER: exampleuser
@@ -64,7 +60,7 @@ services:
6460
volumes:
6561
wordpress:
6662
db:
67-
`, testutil.WordpressImage, testutil.MariaDBImage, testutil.AlpineImage)
63+
`, testutil.WordpressImage, testutil.MariaDBImage, testutil.CommonImage)
6864
comp := testutil.NewComposeDir(t, dockerComposeYAML)
6965
defer comp.CleanUp()
7066
projectName := comp.ProjectName()
@@ -100,9 +96,9 @@ volumes:
10096
time.Sleep(3 * time.Second)
10197
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "wordpress").AssertOutWithFunc(assertHandler("wordpress_container", testutil.WordpressImage))
10298
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "db").AssertOutWithFunc(assertHandler("db_container", testutil.MariaDBImage))
103-
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps").AssertOutNotContains(testutil.AlpineImage)
104-
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "alpine", "-a").AssertOutWithFunc(assertHandler("alpine_container", testutil.AlpineImage))
105-
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-a", "--filter", "status=exited").AssertOutWithFunc(assertHandler("alpine_container", testutil.AlpineImage))
99+
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps").AssertOutNotContains(testutil.CommonImage)
100+
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "alpine", "-a").AssertOutWithFunc(assertHandler("alpine_container", testutil.CommonImage))
101+
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "-a", "--filter", "status=exited").AssertOutWithFunc(assertHandler("alpine_container", testutil.CommonImage))
106102
base.ComposeCmd("-f", comp.YAMLFullPath(), "ps", "--services", "-a").AssertOutContainsAll("wordpress\n", "db\n", "alpine\n")
107103
}
108104

@@ -112,8 +108,6 @@ func TestComposePsJSON(t *testing.T) {
112108

113109
base := testutil.NewBase(t)
114110
var dockerComposeYAML = fmt.Sprintf(`
115-
version: '3.1'
116-
117111
services:
118112
wordpress:
119113
image: %s

0 commit comments

Comments
 (0)