From d8044a6744f9570e964c6e35e12827473ff12cde Mon Sep 17 00:00:00 2001 From: Tzu-Chiao Yeh Date: Thu, 29 Oct 2020 06:03:08 +0800 Subject: [PATCH] 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 Trust: Emmanuel Odeke Run-TryBot: Emmanuel Odeke TryBot-Result: Go Bot --- src/database/sql/sql_test.go | 6 ++---- 1 file 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 } } -- 2.48.1