From: Daniel Theophanes <kardianos@gmail.com>
Date: Wed, 16 Jun 2021 16:46:00 +0000 (-0500)
Subject: database/sql: do not rely on timeout for deadlock test
X-Git-Tag: go1.17rc1~77
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b73cc4b02b;p=gostls13.git

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 80f63e877d..7d1cb9b85a 100644
--- 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)
 	}