Merge pull request redis#234 from go-redis/fix/psubscribe-test

pubsub: add PSubscribe test. Updates redis#233.
sableferret · Dec 31, 2015 · aa0a969 · aa0a969
2 parents d226168 + 1739cd9
commit aa0a969
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/pubsub.go b/pubsub.go
@@ -244,7 +244,7 @@ func (c *PubSub) reconnect(reason error) {
 	}
 	if len(c.patterns) > 0 {
 		if err := c.PSubscribe(c.patterns...); err != nil {
-			log.Printf("redis: Subscribe failed: %s", err)
+			log.Printf("redis: PSubscribe failed: %s", err)
 		}
 	}
 }

diff --git a/pubsub_test.go b/pubsub_test.go
@@ -255,11 +255,7 @@ var _ = Describe("PubSub", func() {
 		wg.Wait()
 	})
 
-	It("should reconnect on ReceiveMessage error", func() {
-		pubsub, err := client.Subscribe("mychannel")
-		Expect(err).NotTo(HaveOccurred())
-		defer pubsub.Close()
-
+	expectReceiveMessage := func(pubsub *redis.PubSub) {
 		cn1, _, err := pubsub.Pool().Get()
 		Expect(err).NotTo(HaveOccurred())
 		cn1.SetNetConn(&badConn{
@@ -284,6 +280,22 @@ var _ = Describe("PubSub", func() {
 		Expect(msg.Payload).To(Equal("hello"))
 
 		wg.Wait()
+	}
+
+	It("Subscribe should reconnect on ReceiveMessage error", func() {
+		pubsub, err := client.Subscribe("mychannel")
+		Expect(err).NotTo(HaveOccurred())
+		defer pubsub.Close()
+
+		expectReceiveMessage(pubsub)
+	})
+
+	It("PSubscribe should reconnect on ReceiveMessage error", func() {
+		pubsub, err := client.PSubscribe("mychannel")
+		Expect(err).NotTo(HaveOccurred())
+		defer pubsub.Close()
+
+		expectReceiveMessage(pubsub)
 	})
 
 	It("should return on Close", func() {