Skip to content

Commit 1345f24

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #4327 from apostasie/2025-05-more-tests-2
[CI] Update registry testing tooling
2 parents d0d1c2d + 4fa13e2 commit 1345f24

21 files changed

+115
-80
lines changed

‎cmd/nerdctl/compose/compose_run_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ services:
142142
}()
143143

144144
checkNginx := func() error {
145-
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 10, false)
145+
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
146146
if err != nil {
147147
return err
148148
}
@@ -201,7 +201,7 @@ services:
201201
}()
202202

203203
checkNginx := func() error {
204-
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 10, false)
204+
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
205205
if err != nil {
206206
return err
207207
}

‎cmd/nerdctl/compose/compose_up_linux_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ COPY index.html /usr/share/nginx/html/index.html
100100
base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d", "--build").AssertOK()
101101
defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").Run()
102102

103-
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 50, false)
103+
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
104104
assert.NilError(t, err)
105105
respBody, err := io.ReadAll(resp.Body)
106106
assert.NilError(t, err)

‎cmd/nerdctl/container/container_run_linux_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ func TestPortBindingWithCustomHost(t *testing.T) {
653653
Errors: []error{},
654654
Output: expect.All(
655655
func(stdout string, t tig.T) {
656-
resp, err := nettestutil.HTTPGet(address, 30, false)
656+
resp, err := nettestutil.HTTPGet(address, 5, false)
657657
assert.NilError(t, err)
658658

659659
respBody, err := io.ReadAll(resp.Body)

‎cmd/nerdctl/container/container_run_network_base_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func baseTestRunPort(t *testing.T, nginxImage string, nginxIndexHTMLSnippet stri
155155
hostPort: "7000-7005",
156156
containerPort: "80-85",
157157
connectURLPort: 7001,
158-
err: "error after 30 attempts",
158+
err: "error after 5 attempts",
159159
runShouldSuccess: true,
160160
},
161161
{
@@ -209,7 +209,7 @@ func baseTestRunPort(t *testing.T, nginxImage string, nginxIndexHTMLSnippet stri
209209
return
210210
}
211211

212-
resp, err := nettestutil.HTTPGet(connectURL, 30, false)
212+
resp, err := nettestutil.HTTPGet(connectURL, 5, false)
213213
if tc.err != "" {
214214
assert.ErrorContains(t, err, tc.err)
215215
return

‎cmd/nerdctl/container/container_run_network_linux_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ func TestRunPortWithNoHostPort(t *testing.T) {
248248
return
249249
}
250250
connectURL := fmt.Sprintf("http://%s:%s", "127.0.0.1", paramsMap["portNumber"])
251-
resp, err := nettestutil.HTTPGet(connectURL, 30, false)
251+
resp, err := nettestutil.HTTPGet(connectURL, 5, false)
252252
assert.NilError(t, err)
253253
respBody, err := io.ReadAll(resp.Body)
254254
assert.NilError(t, err)
@@ -333,15 +333,15 @@ func TestUniqueHostPortAssignement(t *testing.T) {
333333

334334
// Make HTTP GET request to container 1
335335
connectURL1 := fmt.Sprintf("http://%s:%s", "127.0.0.1", port1)
336-
resp1, err := nettestutil.HTTPGet(connectURL1, 30, false)
336+
resp1, err := nettestutil.HTTPGet(connectURL1, 5, false)
337337
assert.NilError(t, err)
338338
respBody1, err := io.ReadAll(resp1.Body)
339339
assert.NilError(t, err)
340340
assert.Assert(t, strings.Contains(string(respBody1), testutil.NginxAlpineIndexHTMLSnippet))
341341

342342
// Make HTTP GET request to container 2
343343
connectURL2 := fmt.Sprintf("http://%s:%s", "127.0.0.1", port2)
344-
resp2, err := nettestutil.HTTPGet(connectURL2, 30, false)
344+
resp2, err := nettestutil.HTTPGet(connectURL2, 5, false)
345345
assert.NilError(t, err)
346346
respBody2, err := io.ReadAll(resp2.Body)
347347
assert.NilError(t, err)

‎cmd/nerdctl/container/container_run_restart_linux_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestRunRestart(t *testing.T) {
6969
}
7070
return nil
7171
}
72-
assert.NilError(t, check(30))
72+
assert.NilError(t, check(5))
7373

7474
base.KillDaemon()
7575
base.EnsureDaemonActive()

‎cmd/nerdctl/container/container_stop_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ func TestStopStart(t *testing.T) {
6666
return nil
6767
}
6868

69-
assert.NilError(t, check(30))
69+
assert.NilError(t, check(5))
7070
base.Cmd("stop", testContainerName).AssertOK()
7171
base.Cmd("exec", testContainerName, "ps").AssertFail()
7272
if check(1) == nil {
7373
t.Fatal("expected to get an error")
7474
}
7575
base.Cmd("start", testContainerName).AssertOK()
76-
assert.NilError(t, check(30))
76+
assert.NilError(t, check(5))
7777
}
7878

7979
func TestStopWithStopSignal(t *testing.T) {

‎cmd/nerdctl/container/multi_platform_linux_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ RUN uname -m > /usr/share/nginx/html/index.html
163163
}
164164

165165
for testURL, expectedIndexHTML := range testCases {
166-
resp, err := nettestutil.HTTPGet(testURL, 50, false)
166+
resp, err := nettestutil.HTTPGet(testURL, 5, false)
167167
assert.NilError(t, err)
168168
respBody, err := io.ReadAll(resp.Body)
169169
assert.NilError(t, err)

‎cmd/nerdctl/helpers/testing_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func ComposeUp(t *testing.T, base *testutil.Base, dockerComposeYAML string, opts
7474
base.Cmd("network", "inspect", fmt.Sprintf("%s_default", projectName)).AssertOK()
7575

7676
checkWordpress := func() error {
77-
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 10, false)
77+
resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
7878
if err != nil {
7979
return err
8080
}

‎cmd/nerdctl/image/image_convert_linux_test.go

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ package image
1919
import (
2020
"fmt"
2121
"testing"
22+
"time"
2223

2324
"github.com/containerd/nerdctl/mod/tigron/require"
2425
"github.com/containerd/nerdctl/mod/tigron/test"
2526

2627
"github.com/containerd/nerdctl/v2/pkg/testutil"
2728
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest"
28-
"github.com/containerd/nerdctl/v2/pkg/testutil/testregistry"
29+
"github.com/containerd/nerdctl/v2/pkg/testutil/nerdtest/registry"
2930
)
3031

3132
func TestImageConvert(t *testing.T) {
@@ -100,7 +101,11 @@ func TestImageConvertNydusVerify(t *testing.T) {
100101

101102
const remoteImageKey = "remoteImageKey"
102103

103-
var registry *testregistry.RegistryServer
104+
var reg *registry.Server
105+
106+
// It is unclear what is problematic here, but we use the kernel version to discriminate against EL
107+
// See: https://github.com/containerd/nerdctl/issues/4332
108+
testutil.RequireKernelVersion(t, ">= 6.0.0-0")
104109

105110
testCase := &test.Case{
106111
Require: require.All(
@@ -110,33 +115,39 @@ func TestImageConvertNydusVerify(t *testing.T) {
110115
require.Binary("nydusd"),
111116
require.Not(nerdtest.Docker),
112117
nerdtest.Rootful,
118+
nerdtest.Registry,
113119
),
114120
Setup: func(data test.Data, helpers test.Helpers) {
115121
helpers.Ensure("pull", "--quiet", testutil.CommonImage)
116-
base := testutil.NewBase(t)
117-
registry = testregistry.NewWithNoAuth(base, 0, false)
118-
data.Labels().Set(remoteImageKey, fmt.Sprintf("%s:%d/nydusd-image:test", "localhost", registry.Port))
122+
reg = nerdtest.RegistryWithNoAuth(data, helpers, 0, false)
123+
reg.Setup(data, helpers)
124+
125+
data.Labels().Set(remoteImageKey, fmt.Sprintf("%s:%d/nydusd-image:test", "localhost", reg.Port))
119126
helpers.Ensure("image", "convert", "--nydus", "--oci", testutil.CommonImage, data.Identifier("converted-image"))
120127
helpers.Ensure("tag", data.Identifier("converted-image"), data.Labels().Get(remoteImageKey))
121128
helpers.Ensure("push", data.Labels().Get(remoteImageKey))
122129
},
123130
Cleanup: func(data test.Data, helpers test.Helpers) {
124131
helpers.Anyhow("rmi", "-f", data.Identifier("converted-image"))
125-
if registry != nil {
126-
registry.Cleanup(nil)
132+
if reg != nil {
133+
reg.Cleanup(data, helpers)
127134
helpers.Anyhow("rmi", "-f", data.Labels().Get(remoteImageKey))
128135
}
129136
},
130137
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
131-
return helpers.Custom("nydusify",
138+
cmd := helpers.Custom("nydusify",
132139
"check",
140+
"--work-dir",
141+
data.Temp().Dir("nydusify-temp"),
133142
"--source",
134143
testutil.CommonImage,
135144
"--target",
136145
data.Labels().Get(remoteImageKey),
137146
"--source-insecure",
138147
"--target-insecure",
139148
)
149+
cmd.WithTimeout(30 * time.Second)
150+
return cmd
140151
},
141152
Expected: test.Expects(0, nil, nil),
142153
}

0 commit comments

Comments
 (0)