Skip to content

Commit

Permalink
Sentinel test: some reliability fixes to 00-base tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
antirez committed Feb 19, 2014
1 parent a88a057 commit e087d8a
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions tests/sentinel-tests/00-base.tcl
@@ -1,3 +1,5 @@
# Check the basic monitoring and failover capabilities.

test "Sentinels aren't monitoring any master" {
foreach_sentinel_id id {
assert {[S $id sentinel masters] eq {}}
Expand Down Expand Up @@ -127,6 +129,7 @@ test "Failover is not possible without majority agreement" {
S $id SENTINEL MONITOR mymaster \
[get_instance_attrib redis $master_id host] \
[get_instance_attrib redis $master_id port] $quorum
S $id SENTINEL SET mymaster down-after-milliseconds 2000
}
}

Expand All @@ -146,7 +149,7 @@ test "Failover works if we configure for absolute agreement" {

R $master_id debug sleep 5
foreach_sentinel_id id {
wait_for_condition 100 50 {
wait_for_condition 1000 50 {
[lindex [S $id SENTINEL GET-MASTER-ADDR-BY-NAME mymaster] 1] != $old_port
} else {
fail "At least one Sentinel did not received failover info"
Expand All @@ -164,4 +167,3 @@ test "Failover works if we configure for absolute agreement" {
test "New master [join $addr {:}] role matches" {
assert {[RI $master_id role] eq {master}}
}

0 comments on commit e087d8a

Please sign in to comment.