From 07c5b76a24e74f7d685eef7f18864634619496a2 Mon Sep 17 00:00:00 2001
From: Jack Christensen <jack@jackchristensen.com>
Date: Mon, 29 May 2017 11:39:06 -0500
Subject: [PATCH] Allow for either of 2 possible errors from tx context
 cancelation

---
 stdlib/sql_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stdlib/sql_test.go b/stdlib/sql_test.go
index bfeb07c6..1aa1f261 100644
--- a/stdlib/sql_test.go
+++ b/stdlib/sql_test.go
@@ -781,8 +781,8 @@ func TestBeginTxContextCancelWithDeadConn(t *testing.T) {
 	cancelFn()
 
 	err = tx.Commit()
-	if err != context.Canceled {
-		t.Fatalf("err => %v, want %v", err, context.Canceled)
+	if err != context.Canceled && err != sql.ErrTxDone {
+		t.Fatalf("err => %v, want %v or %v", err, context.Canceled, sql.ErrTxDone)
 	}
 
 	if err := <-errChan; err != nil {