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

sentinel_test: increase timeout to make build more reliable.

This commit is contained in:
Vladimir Mihailenco 2014-07-04 13:36:49 +03:00
parent 900e7c9572
commit 42ce58ed85
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sentinel_test.go
View File

@ -14,7 +14,7 @@ import (
func startRedis(port string) (*exec.Cmd, error) { func startRedis(port string) (*exec.Cmd, error) {
cmd := exec.Command("redis-server", "--port", port) cmd := exec.Command("redis-server", "--port", port)
if true { if false {
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
} }
@ -26,7 +26,7 @@ func startRedis(port string) (*exec.Cmd, error) {
func startRedisSlave(port, slave string) (*exec.Cmd, error) { func startRedisSlave(port, slave string) (*exec.Cmd, error) {
cmd := exec.Command("redis-server", "--port", port, "--slaveof", "127.0.0.1", slave) cmd := exec.Command("redis-server", "--port", port, "--slaveof", "127.0.0.1", slave)
if true { if false {
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
} }
@ -151,7 +151,7 @@ func TestSentinel(t *testing.T) {
master.Shutdown() master.Shutdown()
// Wait for Redis sentinel to elect new master. // Wait for Redis sentinel to elect new master.
time.Sleep(3 * time.Second) time.Sleep(5 * time.Second)
// Check that client picked up new master. // Check that client picked up new master.
val, err = client.Get("foo").Result() val, err = client.Get("foo").Result()
@ -167,7 +167,7 @@ var sentinelConf = `
port {{ .Port }} port {{ .Port }}
sentinel monitor {{ .MasterName }} 127.0.0.1 {{ .MasterPort }} 1 sentinel monitor {{ .MasterName }} 127.0.0.1 {{ .MasterPort }} 1
sentinel down-after-milliseconds {{ .MasterName }} 200 sentinel down-after-milliseconds {{ .MasterName }} 1000
sentinel failover-timeout {{ .MasterName }} 400 sentinel failover-timeout {{ .MasterName }} 2000
sentinel parallel-syncs {{ .MasterName }} 1 sentinel parallel-syncs {{ .MasterName }} 1
` `