From: Tzu-Chiao Yeh <su3g4284zo6y7@gmail.com>
Date: Wed, 28 Oct 2020 22:03:08 +0000 (+0800)
Subject: database/sql: fix TestTxStmtDeadlock test
X-Git-Tag: go1.16beta1~437
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=d8044a6744f9570e964c6e35e12827473ff12cde;p=gostls13.git

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>
---

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
 		}
 	}