server: fixes test flaps due to drains timing out

Matt Whelan · Matt Whelan · commit 7e6a89e316d5 · 2025-07-15T09:10:35.000-07:00
Use the SucceedSoonDuration rather than a static 30s timeout. This is responsive to various test parameters. Fixes: #149515 Release note: None
diff --git a/pkg/server/api_v2_test.go b/pkg/server/api_v2_test.go
@@ -535,7 +535,7 @@ func TestCheckRestartSafe_Integration(t *testing.T) {
 }
 
 func drain(ctx context.Context, ts1 serverutils.TestServerInterface, t *testing.T) error {
-	timeoutCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
+	timeoutCtx, cancel := context.WithTimeout(ctx, testutils.SucceedsSoonDuration())
 	defer cancel()
 
 	err := ts1.DrainClients(ctx)

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ func TestCheckRestartSafe_Integration(t *testing.T) {`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`func drain(ctx context.Context, ts1 serverutils.TestServerInterface, t *testing.T) error {`
`538`		`- timeoutCtx, cancel := context.WithTimeout(ctx, 30*time.Second)`
	`538`	`+ timeoutCtx, cancel := context.WithTimeout(ctx, testutils.SucceedsSoonDuration())`
`539`	`539`	`defer cancel()`
`540`	`540`
`541`	`541`	`err := ts1.DrainClients(ctx)`