From be223ae3c6c5fb28b5d2f3ceb13ec9ccfc560883 Mon Sep 17 00:00:00 2001 From: Vladimir Mihailenco Date: Mon, 30 Dec 2013 13:45:04 +0200 Subject: [PATCH] Add Travis CI config. --- .travis.yml | 13 ++++++++ Makefile | 2 ++ redis_test.go | 82 ++++++++++++++++++++++++++---------------------- v2/redis_test.go | 38 +++++++++++++--------- 4 files changed, 82 insertions(+), 53 deletions(-) create mode 100644 .travis.yml create mode 100644 Makefile diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..75fdd3de --- /dev/null +++ b/.travis.yml @@ -0,0 +1,13 @@ +language: go + +services: +- redis-server + +go: + - 1.0 + - 1.1 + - 1.2 + - tip + +install: + - go get launchpad.net/gocheck diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..6ca7c140 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +all: + go test ./v2 diff --git a/redis_test.go b/redis_test.go index e960ca13..448c569a 100644 --- a/redis_test.go +++ b/redis_test.go @@ -60,6 +60,7 @@ func (t *RedisConnectorTest) TestTCPConnector(c *C) { ping := client.Ping() c.Check(ping.Err(), IsNil) c.Check(ping.Val(), Equals, "PONG") + c.Assert(client.Close(), IsNil) } func (t *RedisConnectorTest) TestUnixConnector(c *C) { @@ -67,6 +68,7 @@ func (t *RedisConnectorTest) TestUnixConnector(c *C) { ping := client.Ping() c.Check(ping.Err(), IsNil) c.Check(ping.Val(), Equals, "PONG") + c.Assert(client.Close(), IsNil) } //------------------------------------------------------------------------------ @@ -79,24 +81,26 @@ type RedisConnPoolTest struct { var _ = Suite(&RedisConnPoolTest{}) -func (t *RedisConnPoolTest) SetUpTest(c *C) { - if t.client == nil { - openConn := func() (net.Conn, error) { - t.openedConnCount++ - return net.Dial("tcp", redisAddr) - } - initConn := func(c *redis.Client) error { - t.initedConnCount++ - return nil - } - closeConn := func(conn net.Conn) error { - t.closedConnCount++ - return nil - } - - t.client = redis.NewClient(openConn, closeConn, initConn) - t.client.ConnPool.(*redis.MultiConnPool).MaxCap = 10 +func (t *RedisConnPoolTest) SetUpSuite(c *C) { + openConn := func() (net.Conn, error) { + t.openedConnCount++ + return net.Dial("tcp", redisAddr) } + initConn := func(c *redis.Client) error { + t.initedConnCount++ + return nil + } + closeConn := func(conn net.Conn) error { + t.closedConnCount++ + return nil + } + + t.client = redis.NewClient(openConn, closeConn, initConn) + t.client.ConnPool.(*redis.MultiConnPool).MaxCap = 10 +} + +func (t *RedisConnPoolTest) TearDownSuite(c *C) { + c.Assert(t.client.Close(), IsNil) } func (t *RedisConnPoolTest) TearDownTest(c *C) { @@ -227,24 +231,26 @@ var _ = Suite(&RedisTest{}) func Test(t *testing.T) { TestingT(t) } -func (t *RedisTest) SetUpTest(c *C) { - if t.client == nil { - openConn := func() (net.Conn, error) { - t.openedConnCount++ - return net.Dial("tcp", redisAddr) - } - initConn := func(c *redis.Client) error { - t.initedConnCount++ - return nil - } - closeConn := func(conn net.Conn) error { - t.closedConnCount++ - return nil - } - - t.client = redis.NewClient(openConn, closeConn, initConn) - t.client.ConnPool.(*redis.MultiConnPool).MaxCap = 10 +func (t *RedisTest) SetUpSuite(c *C) { + openConn := func() (net.Conn, error) { + t.openedConnCount++ + return net.Dial("tcp", redisAddr) } + initConn := func(c *redis.Client) error { + t.initedConnCount++ + return nil + } + closeConn := func(conn net.Conn) error { + t.closedConnCount++ + return nil + } + + t.client = redis.NewClient(openConn, closeConn, initConn) + t.client.ConnPool.(*redis.MultiConnPool).MaxCap = 10 +} + +func (t *RedisTest) TearDownSuite(c *C) { + c.Assert(t.client.Close(), IsNil) } func (t *RedisTest) TearDownTest(c *C) { @@ -323,7 +329,7 @@ func (t *RedisTest) TestManyKeys(c *C) { } keys := t.client.Keys("keys.*") c.Assert(keys.Err(), IsNil) - c.Assert(keys.Val(), HasLen, 100000) + c.Assert(len(keys.Val()), Equals, 100000) } func (t *RedisTest) TestManyKeys2(c *C) { @@ -337,7 +343,7 @@ func (t *RedisTest) TestManyKeys2(c *C) { mget := t.client.MGet(keys...) c.Assert(mget.Err(), IsNil) - c.Assert(mget.Val(), HasLen, 100002) + c.Assert(len(mget.Val()), Equals, 100002) vals := mget.Val() for i := 0; i < 100000; i++ { c.Assert(vals[i+1], Equals, "hello"+strconv.Itoa(i)) @@ -2554,7 +2560,7 @@ func (t *RedisTest) TestPipelineIncrFromGoroutines(c *C) { reqs, err := pipeline.RunQueued() c.Assert(err, IsNil) - c.Assert(reqs, HasLen, 20000) + c.Assert(len(reqs), Equals, 20000) for _, req := range reqs { if req.Err() != nil { c.Errorf("got %v, expected nil", req.Err()) @@ -2691,7 +2697,7 @@ func (t *RedisTest) TestMultiExecIncrTransaction(c *C) { } }) c.Assert(err, IsNil) - c.Assert(reqs, HasLen, 20000) + c.Assert(len(reqs), Equals, 20000) for _, req := range reqs { if req.Err() != nil { c.Errorf("got %v, expected nil", req.Err()) diff --git a/v2/redis_test.go b/v2/redis_test.go index 4df1e739..1eb29e3a 100644 --- a/v2/redis_test.go +++ b/v2/redis_test.go @@ -63,22 +63,26 @@ type RedisConnectorTest struct{} var _ = Suite(&RedisConnectorTest{}) -func (t *RedisConnectorTest) TestTCPConnector(c *C) { +func (t *RedisConnectorTest) TestNewTCPClient(c *C) { client := redis.NewTCPClient(&redis.Options{ Addr: ":6379", }) ping := client.Ping() c.Check(ping.Err(), IsNil) c.Check(ping.Val(), Equals, "PONG") + c.Assert(client.Close(), IsNil) } -func (t *RedisConnectorTest) TestUnixConnector(c *C) { +func (t *RedisConnectorTest) TestNewUnixClient(c *C) { + c.Skip("not available on Travis CI") + client := redis.NewUnixClient(&redis.Options{ Addr: "/tmp/redis.sock", }) ping := client.Ping() c.Check(ping.Err(), IsNil) c.Check(ping.Val(), Equals, "PONG") + c.Assert(client.Close(), IsNil) } //------------------------------------------------------------------------------ @@ -235,11 +239,11 @@ func (t *RedisTest) SetUpSuite(c *C) { }) } -func (t *RedisTest) SetUpTest(c *C) { - t.resetRedis(c) +func (t *RedisTest) TearDownSuite(c *C) { + c.Assert(t.client.Close(), IsNil) } -func (t *RedisTest) TearDownTest(c *C) { +func (t *RedisTest) SetUpTest(c *C) { t.resetRedis(c) } @@ -307,7 +311,7 @@ func (t *RedisTest) TestManyKeys(c *C) { } keys := t.client.Keys("keys.*") c.Assert(keys.Err(), IsNil) - c.Assert(keys.Val(), HasLen, 100000) + c.Assert(len(keys.Val()), Equals, 100000) } func (t *RedisTest) TestManyKeys2(c *C) { @@ -321,7 +325,7 @@ func (t *RedisTest) TestManyKeys2(c *C) { mget := t.client.MGet(keys...) c.Assert(mget.Err(), IsNil) - c.Assert(mget.Val(), HasLen, 100002) + c.Assert(len(mget.Val()), Equals, 100002) vals := mget.Val() for i := 0; i < 100000; i++ { c.Assert(vals[i+1], Equals, "hello"+strconv.Itoa(i)) @@ -560,7 +564,8 @@ func (t *RedisTest) TestCmdKeysPExpireAt(c *C) { c.Assert(set.Err(), IsNil) c.Assert(set.Val(), Equals, "OK") - pExpireAt := t.client.PExpireAt("key", time.Now().Add(900*time.Millisecond)) + expire := 900 * time.Millisecond + pExpireAt := t.client.PExpireAt("key", time.Now().Add(expire)) c.Assert(pExpireAt.Err(), IsNil) c.Assert(pExpireAt.Val(), Equals, true) @@ -570,7 +575,8 @@ func (t *RedisTest) TestCmdKeysPExpireAt(c *C) { pttl := t.client.PTTL("key") c.Assert(pttl.Err(), IsNil) - c.Assert(pttl.Val(), Equals, 900*time.Millisecond) + c.Assert(pttl.Val() <= expire, Equals, true) + c.Assert(pttl.Val() >= expire-time.Millisecond, Equals, true) } func (t *RedisTest) TestCmdKeysPTTL(c *C) { @@ -968,13 +974,15 @@ func (t *RedisTest) TestStringsMSetNX(c *C) { } func (t *RedisTest) TestStringsPSetEx(c *C) { - pSetEx := t.client.PSetEx("key", 50*time.Millisecond, "hello") + expire := 50 * time.Millisecond + pSetEx := t.client.PSetEx("key", expire, "hello") c.Assert(pSetEx.Err(), IsNil) c.Assert(pSetEx.Val(), Equals, "OK") pttl := t.client.PTTL("key") c.Assert(pttl.Err(), IsNil) - c.Assert(pttl.Val(), Equals, 50*time.Millisecond) + c.Assert(pttl.Val() <= expire, Equals, true) + c.Assert(pttl.Val() >= expire-time.Millisecond, Equals, true) get := t.client.Get("key") c.Assert(get.Err(), IsNil) @@ -2474,7 +2482,7 @@ func (t *RedisTest) TestPipelineIncr(c *C) { cmds, err := pipeline.Exec() c.Assert(err, IsNil) - c.Assert(cmds, HasLen, 20000) + c.Assert(len(cmds), Equals, 20000) for _, cmd := range cmds { if cmd.Err() != nil { c.Errorf("got %v, expected nil", cmd.Err()) @@ -2608,7 +2616,7 @@ func (t *RedisTest) TestMultiExecIncr(c *C) { } }) c.Assert(err, IsNil) - c.Assert(cmds, HasLen, 20000) + c.Assert(len(cmds), Equals, 20000) for _, cmd := range cmds { if cmd.Err() != nil { c.Errorf("got %v, expected nil", cmd.Err()) @@ -2961,8 +2969,8 @@ func (t *RedisTest) BenchmarkRedisGet(c *C) { func (t *RedisTest) BenchmarkRedisMGet(c *C) { c.StopTimer() - mSet := t.client.MSet("key1", "hello1", "key2", "hello2") - c.Assert(mSet.Err(), IsNil) + mset := t.client.MSet("key1", "hello1", "key2", "hello2") + c.Assert(mset.Err(), IsNil) c.StartTimer()