re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make tests less flaky.

This commit is contained in:
Vladimir Mihailenco 2013-12-30 14:24:43 +02:00
parent 09e549f44e
commit 10d639d255
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
v2/command.go
View File

@ -174,9 +174,6 @@ func (cmd *DurationCmd) parseReply(rd reader) (interface{}, error) {
return 0, err return 0, err
} }
vv := time.Duration(v.(int64)) vv := time.Duration(v.(int64))
if vv == -1 {
return vv, nil
}
return vv * cmd.precision, nil return vv * cmd.precision, nil
} }

42
v2/redis_test.go
View File

@ -418,7 +418,7 @@ func (t *RedisTest) TestCmdKeysExpire(c *C) {
ttl = t.client.TTL("key") ttl = t.client.TTL("key")
c.Assert(ttl.Err(), IsNil) c.Assert(ttl.Err(), IsNil)
c.Assert(ttl.Val(), Equals, time.Duration(-1)) c.Assert(ttl.Val() < 0, Equals, true)
} }
func (t *RedisTest) TestCmdKeysExpireAt(c *C) { func (t *RedisTest) TestCmdKeysExpireAt(c *C) {
@ -538,7 +538,7 @@ func (t *RedisTest) TestCmdKeysPersist(c *C) {
ttl = t.client.TTL("key") ttl = t.client.TTL("key")
c.Assert(ttl.Err(), IsNil) c.Assert(ttl.Err(), IsNil)
c.Assert(ttl.Val(), Equals, time.Duration(-1)) c.Assert(ttl.Val() < 0, Equals, true)
} }
func (t *RedisTest) TestCmdKeysPExpire(c *C) { func (t *RedisTest) TestCmdKeysPExpire(c *C) {
@ -546,7 +546,8 @@ func (t *RedisTest) TestCmdKeysPExpire(c *C) {
c.Assert(set.Err(), IsNil) c.Assert(set.Err(), IsNil)
c.Assert(set.Val(), Equals, "OK") c.Assert(set.Val(), Equals, "OK")
pexpire := t.client.PExpire("key", 900*time.Millisecond) expiration := 900 * time.Millisecond
pexpire := t.client.PExpire("key", expiration)
c.Assert(pexpire.Err(), IsNil) c.Assert(pexpire.Err(), IsNil)
c.Assert(pexpire.Val(), Equals, true) c.Assert(pexpire.Val(), Equals, true)
@ -556,7 +557,8 @@ func (t *RedisTest) TestCmdKeysPExpire(c *C) {
pttl := t.client.PTTL("key") pttl := t.client.PTTL("key")
c.Assert(pttl.Err(), IsNil) c.Assert(pttl.Err(), IsNil)
c.Assert(pttl.Val(), Equals, 900*time.Millisecond) c.Assert(pttl.Val() <= expiration, Equals, true)
c.Assert(pttl.Val() >= expiration-time.Millisecond, Equals, true)
} }
func (t *RedisTest) TestCmdKeysPExpireAt(c *C) { func (t *RedisTest) TestCmdKeysPExpireAt(c *C) {
@ -564,10 +566,10 @@ func (t *RedisTest) TestCmdKeysPExpireAt(c *C) {
c.Assert(set.Err(), IsNil) c.Assert(set.Err(), IsNil)
c.Assert(set.Val(), Equals, "OK") c.Assert(set.Val(), Equals, "OK")
expire := 900 * time.Millisecond expiration := 900 * time.Millisecond
pExpireAt := t.client.PExpireAt("key", time.Now().Add(expire)) pexpireat := t.client.PExpireAt("key", time.Now().Add(expiration))
c.Assert(pExpireAt.Err(), IsNil) c.Assert(pexpireat.Err(), IsNil)
c.Assert(pExpireAt.Val(), Equals, true) c.Assert(pexpireat.Val(), Equals, true)
ttl := t.client.TTL("key") ttl := t.client.TTL("key")
c.Assert(ttl.Err(), IsNil) c.Assert(ttl.Err(), IsNil)
@ -575,8 +577,8 @@ func (t *RedisTest) TestCmdKeysPExpireAt(c *C) {
pttl := t.client.PTTL("key") pttl := t.client.PTTL("key")
c.Assert(pttl.Err(), IsNil) c.Assert(pttl.Err(), IsNil)
c.Assert(pttl.Val() <= expire, Equals, true) c.Assert(pttl.Val() <= expiration, Equals, true)
c.Assert(pttl.Val() >= expire-time.Millisecond, Equals, true) c.Assert(pttl.Val() >= expiration-time.Millisecond, Equals, true)
} }
func (t *RedisTest) TestCmdKeysPTTL(c *C) { func (t *RedisTest) TestCmdKeysPTTL(c *C) {
@ -584,13 +586,15 @@ func (t *RedisTest) TestCmdKeysPTTL(c *C) {
c.Assert(set.Err(), IsNil) c.Assert(set.Err(), IsNil)
c.Assert(set.Val(), Equals, "OK") c.Assert(set.Val(), Equals, "OK")
expire := t.client.Expire("key", time.Second) expiration := time.Second
expire := t.client.Expire("key", expiration)
c.Assert(expire.Err(), IsNil) c.Assert(expire.Err(), IsNil)
c.Assert(set.Val(), Equals, "OK") c.Assert(set.Val(), Equals, "OK")
pttl := t.client.PTTL("key") pttl := t.client.PTTL("key")
c.Assert(pttl.Err(), IsNil) c.Assert(pttl.Err(), IsNil)
c.Assert(pttl.Val(), Equals, time.Second) c.Assert(pttl.Val() <= expiration, Equals, true)
c.Assert(pttl.Val() >= expiration-time.Millisecond, Equals, true)
} }
func (t *RedisTest) TestCmdKeysRandomKey(c *C) { func (t *RedisTest) TestCmdKeysRandomKey(c *C) {
@ -678,7 +682,7 @@ func (t *RedisTest) TestCmdKeysSort(c *C) {
func (t *RedisTest) TestCmdKeysTTL(c *C) { func (t *RedisTest) TestCmdKeysTTL(c *C) {
ttl := t.client.TTL("key") ttl := t.client.TTL("key")
c.Assert(ttl.Err(), IsNil) c.Assert(ttl.Err(), IsNil)
c.Assert(ttl.Val(), Equals, time.Duration(-1)) c.Assert(ttl.Val() < 0, Equals, true)
set := t.client.Set("key", "hello") set := t.client.Set("key", "hello")
c.Assert(set.Err(), IsNil) c.Assert(set.Err(), IsNil)
@ -974,15 +978,15 @@ func (t *RedisTest) TestStringsMSetNX(c *C) {
} }
func (t *RedisTest) TestStringsPSetEx(c *C) { func (t *RedisTest) TestStringsPSetEx(c *C) {
expire := 50 * time.Millisecond expiration := 50 * time.Millisecond
pSetEx := t.client.PSetEx("key", expire, "hello") psetex := t.client.PSetEx("key", expiration, "hello")
c.Assert(pSetEx.Err(), IsNil) c.Assert(psetex.Err(), IsNil)
c.Assert(pSetEx.Val(), Equals, "OK") c.Assert(psetex.Val(), Equals, "OK")
pttl := t.client.PTTL("key") pttl := t.client.PTTL("key")
c.Assert(pttl.Err(), IsNil) c.Assert(pttl.Err(), IsNil)
c.Assert(pttl.Val() <= expire, Equals, true) c.Assert(pttl.Val() <= expiration, Equals, true)
c.Assert(pttl.Val() >= expire-time.Millisecond, Equals, true) c.Assert(pttl.Val() >= expiration-time.Millisecond, Equals, true)
get := t.client.Get("key") get := t.client.Get("key")
c.Assert(get.Err(), IsNil) c.Assert(get.Err(), IsNil)