Skip to content

Commit

Permalink
caddytest: Revise sleep durations
Browse files Browse the repository at this point in the history
Attempt to reduce flakiness a bit more

Test suite needs to be rewritten.
  • Loading branch information
mholt committed Oct 5, 2022
1 parent e4fac12 commit e07a267
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions caddytest/caddytest.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (tc *Tester) ensureConfigRunning(rawConfig string, configType string) error
return actual
}

for retries := 4; retries > 0; retries-- {
for retries := 10; retries > 0; retries-- {
if reflect.DeepEqual(expected, fetchConfig(client)) {
return nil
}
Expand Down Expand Up @@ -243,7 +243,7 @@ func validateTestPrerequisites() error {
}()

// wait for caddy to start serving the initial config
for retries := 4; retries > 0 && isCaddyAdminRunning() != nil; retries-- {
for retries := 10; retries > 0 && isCaddyAdminRunning() != nil; retries-- {
time.Sleep(10 * time.Millisecond)
}
}
Expand Down
2 changes: 2 additions & 0 deletions caddytest/integration/reverseproxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"runtime"
"strings"
"testing"
"time"

"github.com/caddyserver/caddy/v2/caddytest"
)
Expand Down Expand Up @@ -441,6 +442,7 @@ func TestReverseProxyHealthCheck(t *testing.T) {
}
`, "caddyfile")

time.Sleep(100 * time.Millisecond) // TODO: for some reason this test seems particularly flaky, getting 503 when it should be 200, unless we wait
tester.AssertGetResponse("http://localhost:9080/", 200, "Hello, World!")
}

Expand Down
4 changes: 2 additions & 2 deletions modules/caddyhttp/reverseproxy/fastcgi/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func sendFcgi(reqType int, fcgiParams map[string]string, data []byte, posts map[

log.Println("c: send data length ≈", length, string(content))
conn.Close()
time.Sleep(1 * time.Second)
time.Sleep(250 * time.Millisecond)

if bytes.Contains(content, []byte("FAILED")) {
globalt.Error("Server return failed message")
Expand Down Expand Up @@ -230,7 +230,7 @@ func DisabledTest(t *testing.T) {
}
}()

time.Sleep(1 * time.Second)
time.Sleep(250 * time.Millisecond)

// init
fcgiParams := make(map[string]string)
Expand Down

0 comments on commit e07a267

Please sign in to comment.