From 689f0619439dc725530f84c382854dac28bd1dfd Mon Sep 17 00:00:00 2001 From: Vladimir Mihailenco Date: Sat, 31 Jan 2015 09:53:08 +0200 Subject: [PATCH] Relax pool test conditions. --- pool_test.go | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pool_test.go b/pool_test.go index 9797ce5..f7916ec 100644 --- a/pool_test.go +++ b/pool_test.go @@ -39,6 +39,7 @@ var _ = Describe("Pool", func() { Expect(err).NotTo(HaveOccurred()) Expect(val).To(Equal("PONG")) }) + pool := client.Pool() Expect(pool.Size()).To(BeNumerically("<=", 10)) Expect(pool.Len()).To(BeNumerically("<=", 10)) @@ -61,8 +62,10 @@ var _ = Describe("Pool", func() { Expect(multi.Close()).NotTo(HaveOccurred()) }) - Expect(client.Pool().Size()).To(Equal(10)) - Expect(client.Pool().Len()).To(Equal(10)) + pool := client.Pool() + Expect(pool.Size()).To(BeNumerically("<=", 10)) + Expect(pool.Len()).To(BeNumerically("<=", 10)) + Expect(pool.Size()).To(Equal(pool.Len())) }) It("should respect max on pipelines", func() { @@ -77,8 +80,10 @@ var _ = Describe("Pool", func() { Expect(pipe.Close()).NotTo(HaveOccurred()) }) - Expect(client.Pool().Size()).To(Equal(10)) - Expect(client.Pool().Len()).To(Equal(10)) + pool := client.Pool() + Expect(pool.Size()).To(BeNumerically("<=", 10)) + Expect(pool.Len()).To(BeNumerically("<=", 10)) + Expect(pool.Size()).To(Equal(pool.Len())) }) It("should respect max on pubsub", func() { @@ -88,8 +93,9 @@ var _ = Describe("Pool", func() { Expect(pubsub.Close()).NotTo(HaveOccurred()) }) - Expect(client.Pool().Size()).To(Equal(0)) - Expect(client.Pool().Len()).To(Equal(0)) + pool := client.Pool() + Expect(pool.Size()).To(Equal(0)) + Expect(pool.Len()).To(Equal(0)) }) It("should remove broken connections", func() { @@ -106,8 +112,9 @@ var _ = Describe("Pool", func() { Expect(err).NotTo(HaveOccurred()) Expect(val).To(Equal("PONG")) - Expect(client.Pool().Size()).To(Equal(1)) - Expect(client.Pool().Len()).To(Equal(1)) + pool := client.Pool() + Expect(pool.Size()).To(Equal(1)) + Expect(pool.Len()).To(Equal(1)) }) It("should reuse connections", func() { @@ -117,8 +124,9 @@ var _ = Describe("Pool", func() { Expect(val).To(Equal("PONG")) } - Expect(client.Pool().Size()).To(Equal(1)) - Expect(client.Pool().Len()).To(Equal(1)) + pool := client.Pool() + Expect(pool.Size()).To(Equal(1)) + Expect(pool.Len()).To(Equal(1)) }) })