From e39eda1366384cdef21f04c5c964ae93e2ea9ce3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alberto=20Garc=C3=ADa=20Hierro?= Date: Thu, 17 Oct 2013 09:02:32 -0700 Subject: [PATCH] database/sql: make tests repeatable with -cpu=n,n New test added in CL 14611045 causes a deadlock when running the tests with -cpu=n,n because the fakedb driver always waits when opening a new connection after running TestConnectionLeak. Reset its state after. R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/14780043 --- src/pkg/database/sql/fakedb_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pkg/database/sql/fakedb_test.go b/src/pkg/database/sql/fakedb_test.go index 2ed1364759..a8adfdd942 100644 --- a/src/pkg/database/sql/fakedb_test.go +++ b/src/pkg/database/sql/fakedb_test.go @@ -151,6 +151,8 @@ func (d *fakeDriver) Open(dsn string) (driver.Conn, error) { if d.waitCh != nil { d.waitingCh <- struct{}{} <-d.waitCh + d.waitCh = nil + d.waitingCh = nil } return conn, nil } -- 2.48.1