Commit 2355ae9b authored by antirez's avatar antirez
Browse files

Sentinel test: tolerate larger delays in init tests.

parent fd2faee5
...@@ -37,7 +37,7 @@ test "(init) Sentinels can start monitoring a master" { ...@@ -37,7 +37,7 @@ test "(init) Sentinels can start monitoring a master" {
test "(init) Sentinels can talk with the master" { test "(init) Sentinels can talk with the master" {
foreach_sentinel_id id { foreach_sentinel_id id {
wait_for_condition 100 50 { wait_for_condition 1000 50 {
[catch {S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster}] == 0 [catch {S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster}] == 0
} else { } else {
fail "Sentinel $id can't talk with the master." fail "Sentinel $id can't talk with the master."
...@@ -48,7 +48,7 @@ test "(init) Sentinels can talk with the master" { ...@@ -48,7 +48,7 @@ test "(init) Sentinels can talk with the master" {
test "(init) Sentinels are able to auto-discover other sentinels" { test "(init) Sentinels are able to auto-discover other sentinels" {
set sentinels [llength $::sentinel_instances] set sentinels [llength $::sentinel_instances]
foreach_sentinel_id id { foreach_sentinel_id id {
wait_for_condition 100 50 { wait_for_condition 1000 50 {
[dict get [S $id SENTINEL MASTER mymaster] num-other-sentinels] == ($sentinels-1) [dict get [S $id SENTINEL MASTER mymaster] num-other-sentinels] == ($sentinels-1)
} else { } else {
fail "At least some sentinel can't detect some other sentinel" fail "At least some sentinel can't detect some other sentinel"
...@@ -58,7 +58,7 @@ test "(init) Sentinels are able to auto-discover other sentinels" { ...@@ -58,7 +58,7 @@ test "(init) Sentinels are able to auto-discover other sentinels" {
test "(init) Sentinels are able to auto-discover slaves" { test "(init) Sentinels are able to auto-discover slaves" {
foreach_sentinel_id id { foreach_sentinel_id id {
wait_for_condition 100 50 { wait_for_condition 1000 50 {
[dict get [S $id SENTINEL MASTER mymaster] num-slaves] == $redis_slaves [dict get [S $id SENTINEL MASTER mymaster] num-slaves] == $redis_slaves
} else { } else {
fail "At least some sentinel can't detect some slave" fail "At least some sentinel can't detect some slave"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment