Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
all:
go test gopkg.in/redis.v2 -cpu=1,2,4
go test gopkg.in/redis.v2 -short -race
7 changes: 5 additions & 2 deletions rate_limit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ import (
)

func TestRateLimiter(t *testing.T) {
const n = 100000
rl := newRateLimiter(time.Second, n)
var n = 100000
if testing.Short() {
n = 1000
}
rl := newRateLimiter(time.Minute, n)

wg := &sync.WaitGroup{}
for i := 0; i < n; i++ {
Expand Down
16 changes: 10 additions & 6 deletions redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -392,17 +392,21 @@ func (t *RedisTest) TestGetBigVal(c *C) {
}

func (t *RedisTest) TestManyKeys(c *C) {
for i := 0; i < 100000; i++ {
var n = 100000

for i := 0; i < n; i++ {
t.client.Set("keys.key"+strconv.Itoa(i), "hello"+strconv.Itoa(i))
}
keys := t.client.Keys("keys.*")
c.Assert(keys.Err(), IsNil)
c.Assert(len(keys.Val()), Equals, 100000)
c.Assert(len(keys.Val()), Equals, n)
}

func (t *RedisTest) TestManyKeys2(c *C) {
var n = 100000

keys := []string{"non-existent-key"}
for i := 0; i < 100000; i++ {
for i := 0; i < n; i++ {
key := "keys.key" + strconv.Itoa(i)
t.client.Set(key, "hello"+strconv.Itoa(i))
keys = append(keys, key)
Expand All @@ -411,13 +415,13 @@ func (t *RedisTest) TestManyKeys2(c *C) {

mget := t.client.MGet(keys...)
c.Assert(mget.Err(), IsNil)
c.Assert(len(mget.Val()), Equals, 100002)
c.Assert(len(mget.Val()), Equals, n+2)
vals := mget.Val()
for i := 0; i < 100000; i++ {
for i := 0; i < n; i++ {
c.Assert(vals[i+1], Equals, "hello"+strconv.Itoa(i))
}
c.Assert(vals[0], Equals, nil)
c.Assert(vals[100001], Equals, nil)
c.Assert(vals[n+1], Equals, nil)
}

func (t *RedisTest) TestStringCmdHelpers(c *C) {
Expand Down