diff options
author | Alberto GarcĂa Hierro <alberto@garciahierro.com> | 2013-10-17 09:02:32 -0700 |
---|---|---|
committer | Brad Fitzpatrick <bradfitz@golang.org> | 2013-10-17 09:02:32 -0700 |
commit | e39eda1366384cdef21f04c5c964ae93e2ea9ce3 (patch) | |
tree | 53ccd471560118c6647ca78e27f66e0e88d55507 | |
parent | 078bcffcb83e5aafd5e368c587bc8cb159a39020 (diff) | |
download | go-e39eda1366384cdef21f04c5c964ae93e2ea9ce3.tar.gz go-e39eda1366384cdef21f04c5c964ae93e2ea9ce3.zip |
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
-rw-r--r-- | src/pkg/database/sql/fakedb_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
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 } |