From a289e9ce7514a34cd930469322395bf0e89b59ea Mon Sep 17 00:00:00 2001 From: Daniel Theophanes Date: Tue, 15 Feb 2022 10:19:16 -0600 Subject: database/sql: make WAIT tests more robust, rely on waiter trigger Replace the WAIT query prefix with a function callback. This fixes timing issues when the testing on loaded servers. Fixes #51208 Change-Id: I5151b397b7066c27ce6bc02c160dde0b584934bc Reviewed-on: https://go-review.googlesource.com/c/go/+/385934 Run-TryBot: Daniel Theophanes TryBot-Result: Gopher Robot Reviewed-by: Bryan Mills Trust: Daniel Theophanes --- src/database/sql/fakedb_test.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/database/sql/fakedb_test.go') diff --git a/src/database/sql/fakedb_test.go b/src/database/sql/fakedb_test.go index 8f953f6cb6..d1edcb8c48 100644 --- a/src/database/sql/fakedb_test.go +++ b/src/database/sql/fakedb_test.go @@ -676,6 +676,9 @@ func (c *fakeConn) PrepareContext(ctx context.Context, query string) (driver.Stm if c.waiter != nil { c.waiter(ctx) + if err := ctx.Err(); err != nil { + return nil, err + } } if stmt.wait > 0 { -- cgit v1.3