Merge #155477

craig[bot] · yuzefovich · craig[bot] · commit dbed2bd0643d · 2025-10-15T20:33:45.000Z
155477: copy: use longer timeout under race in TestCopyInReleasesLeases r=yuzefovich a=yuzefovich Don't hard-code usage of `DefaultSucceedsSoonDuration` - use the helper function that gives longer duration under heavy configs. Fixes: #155335. Release note: None Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
diff --git a/pkg/sql/copy/copy_in_test.go b/pkg/sql/copy/copy_in_test.go
@@ -779,7 +779,7 @@ func TestCopyInReleasesLeases(t *testing.T) {
 	select {
 	case err := <-alterErr:
 		require.NoError(t, err)
-	case <-time.After(testutils.DefaultSucceedsSoonDuration):
+	case <-time.After(testutils.SucceedsSoonDuration()):
 		t.Fatal("alter did not complete")
 	}
 	require.NoError(t, conn.Close(ctx))

Original file line number	Diff line number	Diff line change
`@@ -779,7 +779,7 @@ func TestCopyInReleasesLeases(t *testing.T) {`
`779`	`779`	`select {`
`780`	`780`	`case err := <-alterErr:`
`781`	`781`	`require.NoError(t, err)`
`782`		`- case <-time.After(testutils.DefaultSucceedsSoonDuration):`
	`782`	`+ case <-time.After(testutils.SucceedsSoonDuration()):`
`783`	`783`	`t.Fatal("alter did not complete")`
`784`	`784`	`}`
`785`	`785`	`require.NoError(t, conn.Close(ctx))`