go/echo
go/echo
1
0
Fork 0
mirror of https://github.com/labstack/echo.git synced 2025-05-13 22:06:36 +02:00
Code Issues Releases Activity

remediate flaky timeout tests

Browse Source
This commit is contained in:
toimtoimtoim 2023-02-19 10:38:34 +02:00 committed by Martti T
parent a3998ac96a
commit 2c25767e45
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
middleware/timeout_test.go
View File

@ -375,7 +375,7 @@ func TestTimeoutWithFullEchoStack(t *testing.T) {
// NOTE: timeout middleware is first as it changes Response.Writer and causes data race for logger middleware if it is not first // NOTE: timeout middleware is first as it changes Response.Writer and causes data race for logger middleware if it is not first
e.Use(TimeoutWithConfig(TimeoutConfig{ e.Use(TimeoutWithConfig(TimeoutConfig{
Timeout: 15 * time.Millisecond, Timeout: 100 * time.Millisecond,
})) }))
e.Use(Logger()) e.Use(Logger())
e.Use(Recover()) e.Use(Recover())
@ -403,8 +403,13 @@ func TestTimeoutWithFullEchoStack(t *testing.T) {
} }
if tc.whenForceHandlerTimeout { if tc.whenForceHandlerTimeout {
wg.Done() wg.Done()
// extremely short periods are not reliable for tests when it comes to goroutines. We can not guarantee in which
// order scheduler decides do execute: 1) request goroutine, 2) timeout timer goroutine.
// most of the time we get result we expect but Mac OS seems to be quite flaky
time.Sleep(50 * time.Millisecond)
// shutdown waits for server to shutdown. this way we wait logger mw to be executed // shutdown waits for server to shutdown. this way we wait logger mw to be executed
ctx, cancel := context.WithTimeout(context.Background(), 150*time.Millisecond) ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
defer cancel() defer cancel()
server.Shutdown(ctx) server.Shutdown(ctx)
} }