Skip to content

test(proxy): fix data race and flaky deadline test breaking v2 CI #4496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ReneWerner87 wants to merge 1 commit into from
Closed

test(proxy): fix data race and flaky deadline test breaking v2 CI #4496

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions middleware/proxy/proxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,9 @@ func Test_Proxy_Forward_WithTlsConfig(t *testing.T) {
addr := ln.Addr().String()
clientTLSConf := &tls.Config{InsecureSkipVerify: true} //nolint:gosec // We're in a test func, so this is fine

// disable certificate verification
WithTlsConfig(clientTLSConf)
// disable certificate verification by swapping the whole global client
// (WithTlsConfig mutates the shared client's field and races with parallel proxy tests)
WithClient(&fasthttp.Client{TLSConfig: clientTLSConf})
app.Use(Forward("https://" + addr + "/tlsfwd"))

go func() { utils.AssertEqual(t, nil, app.Listener(ln)) }()
Expand Down Expand Up @@ -565,7 +566,9 @@ func Test_Proxy_DoDeadline_PastDeadline(t *testing.T) {

app := fiber.New()
app.Get("/test", func(c *fiber.Ctx) error {
return DoDeadline(c, "http://"+addr, time.Now().Add(time.Second))
// Deadline is longer than app.Test's 1000ms timeout so the test timeout
// deterministically fires first (avoids two coincident 1s timers racing).
return DoDeadline(c, "http://"+addr, time.Now().Add(2*time.Second))
})

_, err1 := app.Test(httptest.NewRequest(fiber.MethodGet, "/test", nil))
Expand Down
Loading