3 files changed, 110 insertions, 1 deletions
diff --git a/vendor/gopkg.in/throttled/throttled.v1/store/doc.go b/vendor/gopkg.in/throttled/throttled.v1/store/doc.go
index adb4618d3..8e33f2c98 100644
--- a/vendor/gopkg.in/throttled/throttled.v1/store/doc.go
+++ b/vendor/gopkg.in/throttled/throttled.v1/store/doc.go
@@ -1,2 +1,2 @@
 // Package store offers a memory-based and a Redis-based throttled.Store implementation.
-package store
+package store // import "gopkg.in/throttled/throttled.v1/store"
diff --git a/vendor/gopkg.in/throttled/throttled.v1/store/mem_test.go b/vendor/gopkg.in/throttled/throttled.v1/store/mem_test.go
new file mode 100644
index 000000000..e8ef8d0da
--- /dev/null
+++ b/vendor/gopkg.in/throttled/throttled.v1/store/mem_test.go
@@ -0,0 +1,43 @@
+package store
+
+import (
+	"testing"
+	"time"
+)
+
+func TestMemStore(t *testing.T) {
+	st := NewMemStore(0)
+	win := time.Second
+
+	// Reset stores a key with count of 1, current timestamp
+	err := st.Reset("k", time.Second)
+	if err != nil {
+		t.Errorf("expected reset to return nil, got %s", err)
+	}
+	cnt, sec1, _ := st.Incr("k", win)
+	if cnt != 2 {
+		t.Errorf("expected reset+incr to set count to 2, got %d", cnt)
+	}
+
+	// Incr increments the key, keeps same timestamp
+	cnt, sec2, err := st.Incr("k", win)
+	if err != nil {
+		t.Errorf("expected 2nd incr to return nil error, got %s", err)
+	}
+	if cnt != 3 {
+		t.Errorf("expected 2nd incr to return 3, got %d", cnt)
+	}
+	if sec1 != sec2 {
+		t.Errorf("expected 2nd incr to return %d secs, got %d", sec1, sec2)
+	}
+
+	// Reset on existing key brings it back to 1, new timestamp
+	err = st.Reset("k", win)
+	if err != nil {
+		t.Errorf("expected reset on existing key to return nil, got %s", err)
+	}
+	cnt, _, _ = st.Incr("k", win)
+	if cnt != 2 {
+		t.Errorf("expected last reset+incr to return 2, got %d", cnt)
+	}
+}
diff --git a/vendor/gopkg.in/throttled/throttled.v1/store/redis_test.go b/vendor/gopkg.in/throttled/throttled.v1/store/redis_test.go
new file mode 100644
index 000000000..a282d6d25
--- /dev/null
+++ b/vendor/gopkg.in/throttled/throttled.v1/store/redis_test.go
@@ -0,0 +1,66 @@
+package store
+
+import (
+	"testing"
+	"time"
+
+	"github.com/garyburd/redigo/redis"
+)
+
+func getPool() *redis.Pool {
+	pool := &redis.Pool{
+		MaxIdle:     3,
+		IdleTimeout: 30 * time.Second,
+		Dial: func() (redis.Conn, error) {
+			return redis.Dial("tcp", ":6379")
+		},
+		TestOnBorrow: func(c redis.Conn, t time.Time) error {
+			_, err := c.Do("PING")
+			return err
+		},
+	}
+	return pool
+}
+
+func TestRedisStore(t *testing.T) {
+	pool := getPool()
+	c := pool.Get()
+	if _, err := redis.String(c.Do("PING")); err != nil {
+		c.Close()
+		t.Skip("redis server not available on localhost port 6379")
+	}
+	st := NewRedisStore(pool, "throttled:", 1)
+	win := 2 * time.Second
+
+	// Incr increments the key, even if it does not exist
+	cnt, secs, err := st.Incr("k", win)
+	if err != nil {
+		t.Errorf("expected initial incr to return nil error, got %s", err)
+	}
+	if cnt != 1 {
+		t.Errorf("expected initial incr to return 1, got %d", cnt)
+	}
+	if secs != int(win.Seconds()) {
+		t.Errorf("expected initial incr to return %d secs, got %d", int(win.Seconds()), secs)
+	}
+
+	// Waiting a second diminishes the remaining seconds
+	time.Sleep(time.Second)
+	_, sec2, _ := st.Incr("k", win)
+	if sec2 != secs-1 {
+		t.Errorf("expected 2nd incr after a 1s sleep to return %d secs, got %d", secs-1, sec2)
+	}
+
+	// Waiting a second so the key expires, Incr should set back to 1, initial secs
+	time.Sleep(1100 * time.Millisecond)
+	cnt, sec3, err := st.Incr("k", win)
+	if err != nil {
+		t.Errorf("expected last incr to return nil error, got %s", err)
+	}
+	if cnt != 1 {
+		t.Errorf("expected last incr to return 1, got %d", cnt)
+	}
+	if sec3 != int(win.Seconds()) {
+		t.Errorf("expected last incr to return %d secs, got %d", int(win.Seconds()), sec3)
+	}
+}