Update testutil HTTPGet refresh strategy

apostasie · apostasie · commit 599aa39d8970 · 2025-06-23T17:45:44.000-07:00
1. extend the refresh interval from 0.1 second to 1 second
2. normalize all calls to HTTPGet to repeat 5 times (instead of the mix of 10, 30, 5 etc)

We can in the future assess case by case if some tests need more time.
Note that the replacement does not reduce any existing test timeout (30 * 0.1 &lt; 5)

Signed-off-by: apostasie &lt;spam_blackhole@farcloser.world&gt;
diff --git a/cmd/nerdctl/compose/compose_run_linux_test.go b/cmd/nerdctl/compose/compose_run_linux_test.go
@@ -142,7 +142,7 @@ services:
 	}()
 
 	checkNginx := func() error {
-		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 10, false)
+		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
 		if err != nil {
 			return err
 		}
@@ -201,7 +201,7 @@ services:
 	}()
 
 	checkNginx := func() error {
-		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 10, false)
+		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/nerdctl/compose/compose_up_linux_test.go b/cmd/nerdctl/compose/compose_up_linux_test.go
@@ -100,7 +100,7 @@ COPY index.html /usr/share/nginx/html/index.html
 	base.ComposeCmd("-f", comp.YAMLFullPath(), "up", "-d", "--build").AssertOK()
 	defer base.ComposeCmd("-f", comp.YAMLFullPath(), "down", "-v").Run()
 
-	resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 50, false)
+	resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
 	assert.NilError(t, err)
 	respBody, err := io.ReadAll(resp.Body)
 	assert.NilError(t, err)
diff --git a/cmd/nerdctl/container/container_run_linux_test.go b/cmd/nerdctl/container/container_run_linux_test.go
@@ -653,7 +653,7 @@ func TestPortBindingWithCustomHost(t *testing.T) {
 					Errors:   []error{},
 					Output: expect.All(
 						func(stdout string, t tig.T) {
-							resp, err := nettestutil.HTTPGet(address, 30, false)
+							resp, err := nettestutil.HTTPGet(address, 5, false)
 							assert.NilError(t, err)
 
 							respBody, err := io.ReadAll(resp.Body)
diff --git a/cmd/nerdctl/container/container_run_network_base_test.go b/cmd/nerdctl/container/container_run_network_base_test.go
@@ -155,7 +155,7 @@ func baseTestRunPort(t *testing.T, nginxImage string, nginxIndexHTMLSnippet stri
 			hostPort:         "7000-7005",
 			containerPort:    "80-85",
 			connectURLPort:   7001,
-			err:              "error after 30 attempts",
+			err:              "error after 5 attempts",
 			runShouldSuccess: true,
 		},
 		{
@@ -209,7 +209,7 @@ func baseTestRunPort(t *testing.T, nginxImage string, nginxIndexHTMLSnippet stri
 				return
 			}
 
-			resp, err := nettestutil.HTTPGet(connectURL, 30, false)
+			resp, err := nettestutil.HTTPGet(connectURL, 5, false)
 			if tc.err != "" {
 				assert.ErrorContains(t, err, tc.err)
 				return
diff --git a/cmd/nerdctl/container/container_run_network_linux_test.go b/cmd/nerdctl/container/container_run_network_linux_test.go
@@ -248,7 +248,7 @@ func TestRunPortWithNoHostPort(t *testing.T) {
 				return
 			}
 			connectURL := fmt.Sprintf("http://%s:%s", "127.0.0.1", paramsMap["portNumber"])
-			resp, err := nettestutil.HTTPGet(connectURL, 30, false)
+			resp, err := nettestutil.HTTPGet(connectURL, 5, false)
 			assert.NilError(t, err)
 			respBody, err := io.ReadAll(resp.Body)
 			assert.NilError(t, err)
@@ -333,15 +333,15 @@ func TestUniqueHostPortAssignement(t *testing.T) {
 
 			// Make HTTP GET request to container 1
 			connectURL1 := fmt.Sprintf("http://%s:%s", "127.0.0.1", port1)
-			resp1, err := nettestutil.HTTPGet(connectURL1, 30, false)
+			resp1, err := nettestutil.HTTPGet(connectURL1, 5, false)
 			assert.NilError(t, err)
 			respBody1, err := io.ReadAll(resp1.Body)
 			assert.NilError(t, err)
 			assert.Assert(t, strings.Contains(string(respBody1), testutil.NginxAlpineIndexHTMLSnippet))
 
 			// Make HTTP GET request to container 2
 			connectURL2 := fmt.Sprintf("http://%s:%s", "127.0.0.1", port2)
-			resp2, err := nettestutil.HTTPGet(connectURL2, 30, false)
+			resp2, err := nettestutil.HTTPGet(connectURL2, 5, false)
 			assert.NilError(t, err)
 			respBody2, err := io.ReadAll(resp2.Body)
 			assert.NilError(t, err)
diff --git a/cmd/nerdctl/container/container_run_restart_linux_test.go b/cmd/nerdctl/container/container_run_restart_linux_test.go
@@ -69,7 +69,7 @@ func TestRunRestart(t *testing.T) {
 		}
 		return nil
 	}
-	assert.NilError(t, check(30))
+	assert.NilError(t, check(5))
 
 	base.KillDaemon()
 	base.EnsureDaemonActive()
diff --git a/cmd/nerdctl/container/container_stop_linux_test.go b/cmd/nerdctl/container/container_stop_linux_test.go
@@ -66,14 +66,14 @@ func TestStopStart(t *testing.T) {
 		return nil
 	}
 
-	assert.NilError(t, check(30))
+	assert.NilError(t, check(5))
 	base.Cmd("stop", testContainerName).AssertOK()
 	base.Cmd("exec", testContainerName, "ps").AssertFail()
 	if check(1) == nil {
 		t.Fatal("expected to get an error")
 	}
 	base.Cmd("start", testContainerName).AssertOK()
-	assert.NilError(t, check(30))
+	assert.NilError(t, check(5))
 }
 
 func TestStopWithStopSignal(t *testing.T) {
diff --git a/cmd/nerdctl/container/multi_platform_linux_test.go b/cmd/nerdctl/container/multi_platform_linux_test.go
@@ -163,7 +163,7 @@ RUN uname -m > /usr/share/nginx/html/index.html
 	}
 
 	for testURL, expectedIndexHTML := range testCases {
-		resp, err := nettestutil.HTTPGet(testURL, 50, false)
+		resp, err := nettestutil.HTTPGet(testURL, 5, false)
 		assert.NilError(t, err)
 		respBody, err := io.ReadAll(resp.Body)
 		assert.NilError(t, err)
diff --git a/cmd/nerdctl/helpers/testing_linux.go b/cmd/nerdctl/helpers/testing_linux.go
@@ -74,7 +74,7 @@ func ComposeUp(t *testing.T, base *testutil.Base, dockerComposeYAML string, opts
 	base.Cmd("network", "inspect", fmt.Sprintf("%s_default", projectName)).AssertOK()
 
 	checkWordpress := func() error {
-		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 10, false)
+		resp, err := nettestutil.HTTPGet("http://127.0.0.1:8080", 5, false)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/nerdctl/ipfs/ipfs_compose_linux_test.go b/cmd/nerdctl/ipfs/ipfs_compose_linux_test.go
@@ -256,7 +256,7 @@ COPY index.html /usr/share/nginx/html/index.html
 	testCase.Expected = func(data test.Data, helpers test.Helpers) *test.Expected {
 		return &test.Expected{
 			Output: func(stdout string, t tig.T) {
-				resp, err := nettestutil.HTTPGet("http://127.0.0.1:8081", 10, false)
+				resp, err := nettestutil.HTTPGet("http://127.0.0.1:8081", 5, false)
 				assert.NilError(t, err)
 				respBody, err := io.ReadAll(resp.Body)
 				assert.NilError(t, err)
diff --git a/pkg/testutil/nerdtest/registry/cesanta.go b/pkg/testutil/nerdtest/registry/cesanta.go
@@ -201,7 +201,7 @@ func NewCesantaAuthServer(data test.Data, helpers test.Helpers, ca *testca.Cert,
 			scheme,
 			net.JoinHostPort(hostIP.String(), strconv.Itoa(port)),
 		),
-			10,
+			5,
 			true)
 		assert.NilError(helpers.T(), err, fmt.Errorf("failed starting auth container in a timely manner: %w", err))
 
diff --git a/pkg/testutil/nerdtest/registry/docker.go b/pkg/testutil/nerdtest/registry/docker.go
@@ -123,7 +123,7 @@ func NewDockerRegistry(data test.Data, helpers test.Helpers, currentCA *testca.C
 			scheme,
 			net.JoinHostPort(hostIP.String(), strconv.Itoa(port)),
 		),
-			10,
+			5,
 			true)
 		assert.NilError(helpers.T(), err, fmt.Errorf("failed starting docker registry in a timely manner: %w", err))
 	}
diff --git a/pkg/testutil/nerdtest/registry/kubo.go b/pkg/testutil/nerdtest/registry/kubo.go
@@ -72,7 +72,7 @@ func NewKuboRegistry(data test.Data, helpers test.Helpers, t *testing.T, current
 			scheme,
 			net.JoinHostPort(hostIP.String(), strconv.Itoa(port)),
 		),
-			30,
+			5,
 			true)
 		logs := helpers.Capture("logs", containerName)
 		assert.NilError(t, err, fmt.Errorf("failed starting kubo registry in a timely manner: %w - logs: %s", err, logs))
diff --git a/pkg/testutil/nettestutil/nettestutil.go b/pkg/testutil/nettestutil/nettestutil.go
@@ -48,7 +48,7 @@ func HTTPGet(urlStr string, attempts int, insecure bool) (*http.Response, error)
 		if err == nil {
 			return resp, nil
 		}
-		time.Sleep(100 * time.Millisecond)
+		time.Sleep(1 * time.Second)
 	}
 	return nil, fmt.Errorf("error after %d attempts: %w", attempts, err)
 }
diff --git a/pkg/testutil/testregistry/testregistry_linux.go b/pkg/testutil/testregistry/testregistry_linux.go
@@ -155,7 +155,7 @@ acl:
 			return cmd.Error
 		}
 		joined := net.JoinHostPort(hostIP.String(), strconv.Itoa(port))
-		_, err = nettestutil.HTTPGet(fmt.Sprintf("%s://%s/auth", scheme, joined), 30, true)
+		_, err = nettestutil.HTTPGet(fmt.Sprintf("%s://%s/auth", scheme, joined), 5, true)
 		return err
 	}()
 
@@ -340,7 +340,7 @@ func NewRegistry(base *testutil.Base, ca *testca.CA, port int, auth Auth, boundC
 			return "", cmd.Error
 		}
 
-		if _, err = nettestutil.HTTPGet(fmt.Sprintf("%s://%s:%s/v2", scheme, hostIP.String(), strconv.Itoa(port)), 30, true); err != nil {
+		if _, err = nettestutil.HTTPGet(fmt.Sprintf("%s://%s:%s/v2", scheme, hostIP.String(), strconv.Itoa(port)), 5, true); err != nil {
 			return "", err
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func TestRunRestart(t *testing.T) {`
`69`	`69`	`}`
`70`	`70`	`return nil`
`71`	`71`	`}`
`72`		`- assert.NilError(t, check(30))`
	`72`	`+ assert.NilError(t, check(5))`
`73`	`73`
`74`	`74`	`base.KillDaemon()`
`75`	`75`	`base.EnsureDaemonActive()`
Original file line number	Diff line number	Diff line change
`@@ -66,14 +66,14 @@ func TestStopStart(t *testing.T) {`
`66`	`66`	`return nil`
`67`	`67`	`}`
`68`	`68`
`69`		`- assert.NilError(t, check(30))`
	`69`	`+ assert.NilError(t, check(5))`
`70`	`70`	`base.Cmd("stop", testContainerName).AssertOK()`
`71`	`71`	`base.Cmd("exec", testContainerName, "ps").AssertFail()`
`72`	`72`	`if check(1) == nil {`
`73`	`73`	`t.Fatal("expected to get an error")`
`74`	`74`	`}`
`75`	`75`	`base.Cmd("start", testContainerName).AssertOK()`
`76`		`- assert.NilError(t, check(30))`
	`76`	`+ assert.NilError(t, check(5))`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`func TestStopWithStopSignal(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ RUN uname -m > /usr/share/nginx/html/index.html`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`for testURL, expectedIndexHTML := range testCases {`
`166`		`- resp, err := nettestutil.HTTPGet(testURL, 50, false)`
	`166`	`+ resp, err := nettestutil.HTTPGet(testURL, 5, false)`
`167`	`167`	`assert.NilError(t, err)`
`168`	`168`	`respBody, err := io.ReadAll(resp.Body)`
`169`	`169`	`assert.NilError(t, err)`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func ComposeUp(t testing.T, base testutil.Base, dockerComposeYAML string, opts`
`74`	`74`	`base.Cmd("network", "inspect", fmt.Sprintf("%s_default", projectName)).AssertOK()`
`75`	`75`
`76`	`76`	`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)`
`78`	`78`	`if err != nil {`
`79`	`79`	`return err`
`80`	`80`	`}`