aboutsummaryrefslogtreecommitdiff
path: root/vendor/github.com/lib/pq/go18_test.go
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net> 2018-07-06 21:18:14 -0700
committerGravatar Frédéric Guillot <fred@miniflux.net> 2018-07-06 21:18:14 -0700
commit459bb4531f92f8663afb6f36aa9be5b789bd591f (patch)
treef14e6c06b8e5c63612d1ff36f8cab40ae8a99d20 /vendor/github.com/lib/pq/go18_test.go
parent34a3fe426b33a63f2d8e02d4a70c88f137fa5410 (diff)
downloadv2-459bb4531f92f8663afb6f36aa9be5b789bd591f.tar.gz
v2-459bb4531f92f8663afb6f36aa9be5b789bd591f.tar.zst
v2-459bb4531f92f8663afb6f36aa9be5b789bd591f.zip
Update vendor dependencies
Diffstat (limited to 'vendor/github.com/lib/pq/go18_test.go')
-rw-r--r--vendor/github.com/lib/pq/go18_test.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/vendor/github.com/lib/pq/go18_test.go b/vendor/github.com/lib/pq/go18_test.go
index 4bf6391e..1a88a5b4 100644
--- a/vendor/github.com/lib/pq/go18_test.go
+++ b/vendor/github.com/lib/pq/go18_test.go
@@ -228,7 +228,9 @@ func TestContextCancelBegin(t *testing.T) {
cancel()
if err != nil {
t.Fatal(err)
- } else if err := tx.Rollback(); err != nil && err != sql.ErrTxDone {
+ } else if err := tx.Rollback(); err != nil &&
+ err.Error() != "pq: canceling statement due to user request" &&
+ err != sql.ErrTxDone {
t.Fatal(err)
}
}()