diff options
| author | Daniel Theophanes <kardianos@gmail.com> | 2021-06-16 11:46:00 -0500 |
|---|---|---|
| committer | Daniel Theophanes <kardianos@gmail.com> | 2021-06-19 00:46:21 +0000 |
| commit | b73cc4b02b3801603b3ce0bcc57cf01d6aa9a4dd (patch) | |
| tree | 5f52a579b749c075b040d29905fa30f26715f6e3 /src/database | |
| parent | 86743e7d8652c316b5f77a84ffc83244ee10a41b (diff) | |
| download | go-b73cc4b02b3801603b3ce0bcc57cf01d6aa9a4dd.tar.gz | |
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>
Diffstat (limited to 'src/database')
| -rw-r--r-- | src/database/sql/sql_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
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) } |