re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #502 from go-redis/fix/go14-build 

Fix Go 1.4 build.
This commit is contained in:
Vladimir Mihailenco 2017-02-18 13:33:56 +03:00 committed by GitHub
parent 59a96d9d86 c2156b59f3
commit a40c8d17fe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pubsub_test.go
View File

@ -6,10 +6,10 @@ import (
"sync" "sync"
"time" "time"
"gopkg.in/redis.v5"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"gopkg.in/redis.v5"
) )
var _ = Describe("PubSub", func() { var _ = Describe("PubSub", func() {
@ -348,10 +348,13 @@ var _ = Describe("PubSub", func() {
wg.Done() wg.Done()
defer wg.Done() defer wg.Done()
_, err := pubsub.ReceiveMessage()
Expect(err).To(MatchError("redis: client is closed"))
_, err := pubsub.ReceiveMessage()
Expect(err).To(HaveOccurred())
Expect(err).To(SatisfyAny(
MatchError("redis: client is closed"),
MatchError("use of closed network connection"), // Go 1.4
))
}() }()
wg.Wait() wg.Wait()