Allow for either of 2 possible errors from tx context cancelation

batch-wip
Jack Christensen 2017-05-29 11:39:06 -05:00
parent dd5e6a77dc
commit 07c5b76a24
1 changed files with 2 additions and 2 deletions

View File

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