diff options
| author | Tzu-Chiao Yeh <su3g4284zo6y7@gmail.com> | 2020-10-29 06:03:08 +0800 |
|---|---|---|
| committer | Emmanuel Odeke <emmanuel@orijtech.com> | 2020-10-29 00:19:20 +0000 |
| commit | d8044a6744f9570e964c6e35e12827473ff12cde (patch) | |
| tree | 1560c8e2fec4f164e13f4bfae84c843382e304cd /src/database | |
| parent | c1afbf69c71bc624a4766a48ef637a5f726dfe4e (diff) | |
| download | go-d8044a6744f9570e964c6e35e12827473ff12cde.tar.gz go-d8044a6744f9570e964c6e35e12827473ff12cde.zip | |
database/sql: fix TestTxStmtDeadlock test
Drop error check because errors can be
not only ErrTxDone for tx stmt executions,
and the purpose of the test is just reproducing
deadlock.
Fixes #42259
Change-Id: I9e7105ada1403ec7064dcc1c3385b36893a1c195
Reviewed-on: https://go-review.googlesource.com/c/go/+/266097
Reviewed-by: Daniel Theophanes <kardianos@gmail.com>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
Run-TryBot: Emmanuel Odeke <emmanuel@orijtech.com>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/database')
| -rw-r--r-- | src/database/sql/sql_test.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index 8ae6e1339e..4b02657b7e 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -2828,12 +2828,10 @@ func TestTxStmtDeadlock(t *testing.T) { } // Run number of stmt queries to reproduce deadlock from context cancel for i := 0; i < 1e3; i++ { + // Encounter any close related errors (e.g. ErrTxDone, stmt is closed) + // is expected due to context cancel. _, err = stmt.Query(1) if err != nil { - // Encounter ErrTxDone here is expected due to context cancel - if err != ErrTxDone { - t.Fatalf("unexpected error while executing stmt, err: %v", err) - } break } } |