From 08bd2b612fdb0087a309a1a75330d55a2a92c957 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Sat, 12 Jan 2019 12:04:44 -0600 Subject: [PATCH] Streamline test --- conn_test.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/conn_test.go b/conn_test.go index c9816b58..053e2202 100644 --- a/conn_test.go +++ b/conn_test.go @@ -247,15 +247,11 @@ func TestExecContextCancelationCancelsQuery(t *testing.T) { conn := mustConnectString(t, os.Getenv("PGX_TEST_DATABASE")) defer closeConn(t, conn) - ctx, cancelFunc := context.WithCancel(context.Background()) - go func() { - time.Sleep(500 * time.Millisecond) - cancelFunc() - }() - - _, err := conn.Exec(ctx, "select pg_sleep(60)") - if err != context.Canceled { - t.Fatalf("Expected context.Canceled err, got %v", err) + ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + _, err := conn.Exec(ctx, "select pg_sleep(1)") + cancel() + if err != context.DeadlineExceeded { + t.Fatalf("Expected context.DeadlineExceeded err, got %v", err) } if !conn.LastStmtSent() { t.Error("Expected LastStmtSent to return true")