From dfe250c13b3164cc01430a6aaaaf73e6ab5fd8c8 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Fri, 2 Jun 2017 08:38:27 -0500 Subject: [PATCH] Allow either error message --- 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 1aa1f261..bf99a8bb 100644 --- a/stdlib/sql_test.go +++ b/stdlib/sql_test.go @@ -714,8 +714,8 @@ func TestBeginTxContextCancel(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) } var n int