summaryrefslogtreecommitdiffstats
path: root/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go')
-rw-r--r--Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go94
1 files changed, 52 insertions, 42 deletions
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go
index 1fe305f16..9419a128f 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go
@@ -22,7 +22,6 @@ import (
"testing"
"time"
- "github.com/garyburd/redigo/internal/redistest"
"github.com/garyburd/redigo/redis"
)
@@ -32,10 +31,16 @@ type poolTestConn struct {
redis.Conn
}
-func (c *poolTestConn) Close() error { c.d.open -= 1; return nil }
-func (c *poolTestConn) Err() error { return c.err }
+func (c *poolTestConn) Close() error {
+ c.d.mu.Lock()
+ c.d.open -= 1
+ c.d.mu.Unlock()
+ return c.Conn.Close()
+}
+
+func (c *poolTestConn) Err() error { return c.err }
-func (c *poolTestConn) Do(commandName string, args ...interface{}) (reply interface{}, err error) {
+func (c *poolTestConn) Do(commandName string, args ...interface{}) (interface{}, error) {
if commandName == "ERR" {
c.err = args[0].(error)
commandName = "PING"
@@ -52,6 +57,7 @@ func (c *poolTestConn) Send(commandName string, args ...interface{}) error {
}
type poolDialer struct {
+ mu sync.Mutex
t *testing.T
dialed int
open int
@@ -60,19 +66,25 @@ type poolDialer struct {
}
func (d *poolDialer) dial() (redis.Conn, error) {
+ d.mu.Lock()
d.dialed += 1
- if d.dialErr != nil {
+ dialErr := d.dialErr
+ d.mu.Unlock()
+ if dialErr != nil {
return nil, d.dialErr
}
- c, err := redistest.Dial()
+ c, err := redis.DialDefaultServer()
if err != nil {
return nil, err
}
+ d.mu.Lock()
d.open += 1
+ d.mu.Unlock()
return &poolTestConn{d: d, Conn: c}, nil
}
func (d *poolDialer) check(message string, p *redis.Pool, dialed, open int) {
+ d.mu.Lock()
if d.dialed != dialed {
d.t.Errorf("%s: dialed=%d, want %d", message, d.dialed, dialed)
}
@@ -82,6 +94,7 @@ func (d *poolDialer) check(message string, p *redis.Pool, dialed, open int) {
if active := p.ActiveCount(); active != open {
d.t.Errorf("%s: active=%d, want %d", message, active, open)
}
+ d.mu.Unlock()
}
func TestPoolReuse(t *testing.T) {
@@ -111,6 +124,8 @@ func TestPoolMaxIdle(t *testing.T) {
MaxIdle: 2,
Dial: d.dial,
}
+ defer p.Close()
+
for i := 0; i < 10; i++ {
c1 := p.Get()
c1.Do("PING")
@@ -133,6 +148,7 @@ func TestPoolError(t *testing.T) {
MaxIdle: 2,
Dial: d.dial,
}
+ defer p.Close()
c := p.Get()
c.Do("ERR", io.EOF)
@@ -154,6 +170,7 @@ func TestPoolClose(t *testing.T) {
MaxIdle: 2,
Dial: d.dial,
}
+ defer p.Close()
c1 := p.Get()
c1.Do("PING")
@@ -195,6 +212,7 @@ func TestPoolTimeout(t *testing.T) {
IdleTimeout: 300 * time.Second,
Dial: d.dial,
}
+ defer p.Close()
now := time.Now()
redis.SetNowFunc(func() time.Time { return now })
@@ -213,14 +231,14 @@ func TestPoolTimeout(t *testing.T) {
c.Close()
d.check("2", p, 2, 1)
-
- p.Close()
}
func TestPoolConcurrenSendReceive(t *testing.T) {
p := &redis.Pool{
- Dial: redistest.Dial,
+ Dial: redis.DialDefaultServer,
}
+ defer p.Close()
+
c := p.Get()
done := make(chan error, 1)
go func() {
@@ -238,7 +256,6 @@ func TestPoolConcurrenSendReceive(t *testing.T) {
t.Fatalf("Do() returned error %v", err)
}
c.Close()
- p.Close()
}
func TestPoolBorrowCheck(t *testing.T) {
@@ -248,6 +265,7 @@ func TestPoolBorrowCheck(t *testing.T) {
Dial: d.dial,
TestOnBorrow: func(redis.Conn, time.Time) error { return redis.Error("BLAH") },
}
+ defer p.Close()
for i := 0; i < 10; i++ {
c := p.Get()
@@ -255,7 +273,6 @@ func TestPoolBorrowCheck(t *testing.T) {
c.Close()
}
d.check("1", p, 10, 1)
- p.Close()
}
func TestPoolMaxActive(t *testing.T) {
@@ -265,6 +282,8 @@ func TestPoolMaxActive(t *testing.T) {
MaxActive: 2,
Dial: d.dial,
}
+ defer p.Close()
+
c1 := p.Get()
c1.Do("PING")
c2 := p.Get()
@@ -289,7 +308,6 @@ func TestPoolMaxActive(t *testing.T) {
c3.Close()
d.check("4", p, 2, 2)
- p.Close()
}
func TestPoolMonitorCleanup(t *testing.T) {
@@ -299,12 +317,13 @@ func TestPoolMonitorCleanup(t *testing.T) {
MaxActive: 2,
Dial: d.dial,
}
+ defer p.Close()
+
c := p.Get()
c.Send("MONITOR")
c.Close()
d.check("", p, 1, 0)
- p.Close()
}
func TestPoolPubSubCleanup(t *testing.T) {
@@ -314,6 +333,7 @@ func TestPoolPubSubCleanup(t *testing.T) {
MaxActive: 2,
Dial: d.dial,
}
+ defer p.Close()
c := p.Get()
c.Send("SUBSCRIBE", "x")
@@ -334,8 +354,6 @@ func TestPoolPubSubCleanup(t *testing.T) {
t.Errorf("got commands %v, want %v", d.commands, want)
}
d.commands = nil
-
- p.Close()
}
func TestPoolTransactionCleanup(t *testing.T) {
@@ -345,6 +363,7 @@ func TestPoolTransactionCleanup(t *testing.T) {
MaxActive: 2,
Dial: d.dial,
}
+ defer p.Close()
c := p.Get()
c.Do("WATCH", "key")
@@ -406,8 +425,6 @@ func TestPoolTransactionCleanup(t *testing.T) {
t.Errorf("got commands %v, want %v", d.commands, want)
}
d.commands = nil
-
- p.Close()
}
func startGoroutines(p *redis.Pool, cmd string, args ...interface{}) chan error {
@@ -436,6 +453,7 @@ func TestWaitPool(t *testing.T) {
Wait: true,
}
defer p.Close()
+
c := p.Get()
errs := startGoroutines(p, "PING")
d.check("before close", p, 1, 1)
@@ -462,6 +480,8 @@ func TestWaitPoolClose(t *testing.T) {
Dial: d.dial,
Wait: true,
}
+ defer p.Close()
+
c := p.Get()
if _, err := c.Do("PING"); err != nil {
t.Fatal(err)
@@ -497,6 +517,7 @@ func TestWaitPoolCommandError(t *testing.T) {
Wait: true,
}
defer p.Close()
+
c := p.Get()
errs := startGoroutines(p, "ERR", testErr)
d.check("before close", p, 1, 1)
@@ -525,6 +546,7 @@ func TestWaitPoolDialError(t *testing.T) {
Wait: true,
}
defer p.Close()
+
c := p.Get()
errs := startGoroutines(p, "ERR", testErr)
d.check("before close", p, 1, 1)
@@ -565,7 +587,7 @@ func TestWaitPoolDialError(t *testing.T) {
// test ensures that iteration will work correctly if multiple threads are
// iterating simultaneously.
func TestLocking_TestOnBorrowFails_PoolDoesntCrash(t *testing.T) {
- count := 100
+ const count = 100
// First we'll Create a pool where the pilfering of idle connections fails.
d := poolDialer{t: t}
@@ -580,29 +602,17 @@ func TestLocking_TestOnBorrowFails_PoolDoesntCrash(t *testing.T) {
defer p.Close()
// Fill the pool with idle connections.
- b1 := sync.WaitGroup{}
- b1.Add(count)
- b2 := sync.WaitGroup{}
- b2.Add(count)
- for i := 0; i < count; i++ {
- go func() {
- c := p.Get()
- if c.Err() != nil {
- t.Errorf("pool get failed: %v", c.Err())
- }
- b1.Done()
- b1.Wait()
- c.Close()
- b2.Done()
- }()
+ conns := make([]redis.Conn, count)
+ for i := range conns {
+ conns[i] = p.Get()
}
- b2.Wait()
- if d.dialed != count {
- t.Errorf("Expected %d dials, got %d", count, d.dialed)
+ for i := range conns {
+ conns[i].Close()
}
// Spawn a bunch of goroutines to thrash the pool.
- b2.Add(count)
+ var wg sync.WaitGroup
+ wg.Add(count)
for i := 0; i < count; i++ {
go func() {
c := p.Get()
@@ -610,10 +620,10 @@ func TestLocking_TestOnBorrowFails_PoolDoesntCrash(t *testing.T) {
t.Errorf("pool get failed: %v", c.Err())
}
c.Close()
- b2.Done()
+ wg.Done()
}()
}
- b2.Wait()
+ wg.Wait()
if d.dialed != count*2 {
t.Errorf("Expected %d dials, got %d", count*2, d.dialed)
}
@@ -621,7 +631,7 @@ func TestLocking_TestOnBorrowFails_PoolDoesntCrash(t *testing.T) {
func BenchmarkPoolGet(b *testing.B) {
b.StopTimer()
- p := redis.Pool{Dial: redistest.Dial, MaxIdle: 2}
+ p := redis.Pool{Dial: redis.DialDefaultServer, MaxIdle: 2}
c := p.Get()
if err := c.Err(); err != nil {
b.Fatal(err)
@@ -637,7 +647,7 @@ func BenchmarkPoolGet(b *testing.B) {
func BenchmarkPoolGetErr(b *testing.B) {
b.StopTimer()
- p := redis.Pool{Dial: redistest.Dial, MaxIdle: 2}
+ p := redis.Pool{Dial: redis.DialDefaultServer, MaxIdle: 2}
c := p.Get()
if err := c.Err(); err != nil {
b.Fatal(err)
@@ -656,7 +666,7 @@ func BenchmarkPoolGetErr(b *testing.B) {
func BenchmarkPoolGetPing(b *testing.B) {
b.StopTimer()
- p := redis.Pool{Dial: redistest.Dial, MaxIdle: 2}
+ p := redis.Pool{Dial: redis.DialDefaultServer, MaxIdle: 2}
c := p.Get()
if err := c.Err(); err != nil {
b.Fatal(err)
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-08-23 08:48:16 +0000