database/sql: do not rely on timeout for deadlock test

Fixes #46783

Change-Id: I8a8d1716279a041a7411c0c47a440a7997b39c80
Reviewed-on: https://go-review.googlesource.com/c/go/+/328649
Run-TryBot: Daniel Theophanes <kardianos@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Trust: Carlos Amedee <carlos@golang.org>

diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go
index 80f63e877d002472b522f9b26cd4cd477f401807..7d1cb9b85a59bf48060f939cc6f861ea474cf01d 100644 (file)
--- a/src/database/sql/sql_test.go
+++ b/src/database/sql/sql_test.go
@@ -2838,9 +2838,10 @@ func TestTxStmtDeadlock(t *testing.T) {
        db := newTestDB(t, "people")
        defer closeDB(t, db)
 
-       ctx, cancel := context.WithTimeout(context.Background(), 5*time.Millisecond)
+       ctx, cancel := context.WithCancel(context.Background())
        defer cancel()
        tx, err := db.BeginTx(ctx, nil)
+       cancel()
        if err != nil {
                t.Fatal(err)
        }