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

Run tests against latest Redis version.

This commit is contained in:
Vladimir Mihailenco 2015-05-18 14:43:08 +03:00
parent 4df8b2bbbc
commit bca8659b54
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands_test.go
View File

@ -273,7 +273,7 @@ var _ = Describe("Commands", func() {
}) })
It("should Migrate", func() { It("should Migrate", func() {
migrate := client.Migrate("localhost", "6380", "key", 0, 0) migrate := client.Migrate("localhost", redisSecondaryPort, "key", 0, 0)
Expect(migrate.Err()).NotTo(HaveOccurred()) Expect(migrate.Err()).NotTo(HaveOccurred())
Expect(migrate.Val()).To(Equal("NOKEY")) Expect(migrate.Val()).To(Equal("NOKEY"))
@ -281,7 +281,7 @@ var _ = Describe("Commands", func() {
Expect(set.Err()).NotTo(HaveOccurred()) Expect(set.Err()).NotTo(HaveOccurred())
Expect(set.Val()).To(Equal("OK")) Expect(set.Val()).To(Equal("OK"))
migrate = client.Migrate("localhost", "6380", "key", 0, 0) migrate = client.Migrate("localhost", redisSecondaryPort, "key", 0, 0)
Expect(migrate.Err()).To(MatchError("IOERR error or timeout writing to target instance")) Expect(migrate.Err()).To(MatchError("IOERR error or timeout writing to target instance"))
Expect(migrate.Val()).To(Equal("")) Expect(migrate.Val()).To(Equal(""))
}) })

13
main_test.go
View File

@ -17,7 +17,11 @@ import (
"gopkg.in/redis.v3" "gopkg.in/redis.v3"
) )
const redisAddr = ":6379" const (
redisPort = "6380"
redisAddr = ":" + redisPort
redisSecondaryPort = "6381"
)
const ( const (
sentinelName = "mymaster" sentinelName = "mymaster"
@ -27,7 +31,7 @@ const (
sentinelPort = "8126" sentinelPort = "8126"
) )
var sentinelMaster, sentinelSlave1, sentinelSlave2, sentinel *redisProcess var redisMain, sentinelMaster, sentinelSlave1, sentinelSlave2, sentinel *redisProcess
var cluster = &clusterScenario{ var cluster = &clusterScenario{
ports: []string{"8220", "8221", "8222", "8223", "8224", "8225"}, ports: []string{"8220", "8221", "8222", "8223", "8224", "8225"},
@ -39,6 +43,9 @@ var cluster = &clusterScenario{
var _ = BeforeSuite(func() { var _ = BeforeSuite(func() {
var err error var err error
redisMain, err = startRedis(redisPort)
Expect(err).NotTo(HaveOccurred())
sentinelMaster, err = startRedis(sentinelMasterPort) sentinelMaster, err = startRedis(sentinelMasterPort)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
@ -57,6 +64,8 @@ var _ = BeforeSuite(func() {
}) })
var _ = AfterSuite(func() { var _ = AfterSuite(func() {
Expect(redisMain.Close()).NotTo(HaveOccurred())
Expect(sentinel.Close()).NotTo(HaveOccurred()) Expect(sentinel.Close()).NotTo(HaveOccurred())
Expect(sentinelSlave1.Close()).NotTo(HaveOccurred()) Expect(sentinelSlave1.Close()).NotTo(HaveOccurred())
Expect(sentinelSlave2.Close()).NotTo(HaveOccurred()) Expect(sentinelSlave2.Close()).NotTo(HaveOccurred())