From c844a2402bef2bff7616a8cf15c1a6b602a22ec2 Mon Sep 17 00:00:00 2001 From: Valery Krivchikov Date: Sat, 15 Sep 2018 13:23:09 +0300 Subject: [PATCH] Call context.WithTimeout cancel function --- conn_test.go | 12 ++++++++---- stdlib/sql_test.go | 12 ++++++++---- stress_test.go | 3 ++- tx.go | 3 ++- tx_test.go | 6 ++++-- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/conn_test.go b/conn_test.go index f208be8e..83df2c8d 100644 --- a/conn_test.go +++ b/conn_test.go @@ -1553,7 +1553,8 @@ func TestListenNotify(t *testing.T) { } // when timeout occurs - ctx, _ = context.WithTimeout(context.Background(), time.Millisecond) + ctx, cancel = context.WithTimeout(context.Background(), time.Millisecond) + defer cancel() notification, err = listener.WaitForNotification(ctx) if err != context.DeadlineExceeded { t.Errorf("WaitForNotification returned the wrong kind of error: %v", err) @@ -1610,7 +1611,8 @@ func TestUnlistenSpecificChannel(t *testing.T) { t.Fatalf("Unexpected error on Query: %v", rows.Err()) } - ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + defer cancel() notification, err = listener.WaitForNotification(ctx) if err != context.DeadlineExceeded { t.Errorf("WaitForNotification returned the wrong kind of error: %v", err) @@ -1690,7 +1692,8 @@ func TestListenNotifySelfNotification(t *testing.T) { // Notify self and WaitForNotification immediately mustExec(t, conn, "notify self") - ctx, _ := context.WithTimeout(context.Background(), time.Second) + ctx, cancel := context.WithTimeout(context.Background(), time.Second) + defer cancel() notification, err := conn.WaitForNotification(ctx) if err != nil { t.Fatalf("Unexpected error on WaitForNotification: %v", err) @@ -1708,7 +1711,8 @@ func TestListenNotifySelfNotification(t *testing.T) { t.Fatalf("Unexpected error on Query: %v", rows.Err()) } - ctx, _ = context.WithTimeout(context.Background(), time.Second) + ctx, cancel = context.WithTimeout(context.Background(), time.Second) + defer cancel() notification, err = conn.WaitForNotification(ctx) if err != nil { t.Fatalf("Unexpected error on WaitForNotification: %v", err) diff --git a/stdlib/sql_test.go b/stdlib/sql_test.go index a3a96ffd..02b0655f 100644 --- a/stdlib/sql_test.go +++ b/stdlib/sql_test.go @@ -869,7 +869,8 @@ func TestConnPingContextCancel(t *testing.T) { } defer closeDB(t, db) - ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + defer cancel() err = db.PingContext(ctx) if err != context.DeadlineExceeded { @@ -923,7 +924,8 @@ func TestConnPrepareContextCancel(t *testing.T) { } defer closeDB(t, db) - ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + defer cancel() _, err = db.PrepareContext(ctx, "select now()") if err != context.DeadlineExceeded { @@ -974,7 +976,8 @@ func TestConnExecContextCancel(t *testing.T) { } defer closeDB(t, db) - ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + defer cancel() _, err = db.ExecContext(ctx, "create temporary table exec_context_test(id serial primary key)") if err != context.DeadlineExceeded { @@ -1145,7 +1148,8 @@ func TestStmtExecContextCancel(t *testing.T) { } defer stmt.Close() - ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + defer cancel() _, err = stmt.ExecContext(ctx, 42) if err != context.DeadlineExceeded { diff --git a/stress_test.go b/stress_test.go index 114bec81..d6b89c51 100644 --- a/stress_test.go +++ b/stress_test.go @@ -213,7 +213,8 @@ func listenAndPoolUnlistens(pool *pgx.ConnPool, actionNum int) error { return err } - ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + defer cancel() _, err = conn.WaitForNotification(ctx) if err == context.DeadlineExceeded { return nil diff --git a/tx.go b/tx.go index eb6b6805..0fb428fb 100644 --- a/tx.go +++ b/tx.go @@ -147,7 +147,8 @@ func (tx *Tx) CommitEx(ctx context.Context) error { // defer tx.Rollback() is safe even if tx.Commit() will be called first in a // non-error condition. func (tx *Tx) Rollback() error { - ctx, _ := context.WithTimeout(context.Background(), 15*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second) + defer cancel() return tx.RollbackEx(ctx) } diff --git a/tx_test.go b/tx_test.go index f9a9d5c7..eff5604e 100644 --- a/tx_test.go +++ b/tx_test.go @@ -261,7 +261,8 @@ func TestConnBeginExContextCancel(t *testing.T) { conn := mustConnect(t, mockConfig) - ctx, _ := context.WithTimeout(context.Background(), 50*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond) + defer cancel() _, err = conn.BeginEx(ctx, nil) if err != context.DeadlineExceeded { @@ -315,7 +316,8 @@ func TestTxCommitExCancel(t *testing.T) { t.Fatal(err) } - ctx, _ := context.WithTimeout(context.Background(), 50*time.Millisecond) + ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond) + defer cancel() err = tx.CommitEx(ctx) if err != context.DeadlineExceeded { t.Errorf("err => %v, want %v", err, context.DeadlineExceeded)