Skip to content

Commit e1a4359

Browse files
author
dev-local
committed
revert: keep timeouts at 20s (not 60s)
1 parent b327f69 commit e1a4359

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

main_integration_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ func startServer(ctx context.Context) (*exec.Cmd, string, error) {
255255
return cmd, "", fmt.Errorf("no listening address found in server output:\n%s", combinedOutput)
256256
}
257257
}
258-
case <-time.After(60 * time.Second):
258+
case <-time.After(20 * time.Second):
259259
// no listen line in time; try fallbacks as above
260260
fallbacks := []string{"127.0.0.1:8787", "localhost:8787"}
261261
if env := os.Getenv("INTEGRATION_FALLBACK_ADDRS"); env != "" {
@@ -273,7 +273,7 @@ func startServer(ctx context.Context) (*exec.Cmd, string, error) {
273273
}
274274
if addrToWait == "" {
275275
_ = cmd.Process.Kill()
276-
return cmd, "", fmt.Errorf("no listening address found within 60s and fallbacks failed")
276+
return cmd, "", fmt.Errorf("no listening address found within 20s and fallbacks failed")
277277
}
278278
}
279279

@@ -288,7 +288,7 @@ func startServer(ctx context.Context) (*exec.Cmd, string, error) {
288288

289289
// waitForTCP blocks until the given address is reachable via TCP, or the context expires.
290290
func waitForTCP(ctx context.Context, addr string) error {
291-
ctx, cancel := context.WithTimeout(ctx, 60*time.Second)
291+
ctx, cancel := context.WithTimeout(ctx, 20*time.Second)
292292
defer cancel()
293293

294294
var lastErr error

0 commit comments

Comments
 (0)