Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Sentinel test: move init tests as includes.

Most units will start with these two basic tests to create an
environment where the real tests are ran.
  • Loading branch information...
commit d7da507683028e6bb7b53220f85b574e4a51dce9 1 parent 5765444
@antirez authored
View
26 tests/sentinel-tests/00-base.tcl
@@ -1,30 +1,6 @@
# Check the basic monitoring and failover capabilities.
-test "Sentinels aren't monitoring any master" {
- foreach_sentinel_id id {
- assert {[S $id sentinel masters] eq {}}
- }
-}
-
-set redis_slaves 4
-test "Create a master-slaves cluster of [expr $redis_slaves+1] instances" {
- create_redis_master_slave_cluster [expr {$redis_slaves+1}]
-}
-set master_id 0
-
-test "Sentinels can start monitoring a master" {
- set sentinels [llength $::sentinel_instances]
- set quorum [expr {$sentinels/2+1}]
- foreach_sentinel_id id {
- catch {S $id SENTINEL REMOVE mymaster}
- S $id SENTINEL MONITOR mymaster \
- [get_instance_attrib redis $master_id host] \
- [get_instance_attrib redis $master_id port] $quorum
- }
- foreach_sentinel_id id {
- assert {[S $id sentinel master mymaster] ne {}}
- }
-}
+source "../sentinel-tests/includes/init-tests.tcl"
test "Sentinels are able to auto-discover other sentinels" {
set sentinels [llength $::sentinel_instances]
View
23 tests/sentinel-tests/includes/init-tests.tcl
@@ -0,0 +1,23 @@
+# Initialization tests -- most units will start including this.
+
+set redis_slaves 4
+test "Create a master-slaves cluster of [expr $redis_slaves+1] instances" {
+ create_redis_master_slave_cluster [expr {$redis_slaves+1}]
+}
+set master_id 0
+
+test "Sentinels can start monitoring a master" {
+ set sentinels [llength $::sentinel_instances]
+ set quorum [expr {$sentinels/2+1}]
+ foreach_sentinel_id id {
+ catch {S $id SENTINEL REMOVE mymaster}
+ S $id SENTINEL MONITOR mymaster \
+ [get_instance_attrib redis $master_id host] \
+ [get_instance_attrib redis $master_id port] $quorum
+ }
+ foreach_sentinel_id id {
+ assert {[S $id sentinel master mymaster] ne {}}
+ }
+}
+
+
View
1  tests/sentinel.tcl
@@ -141,6 +141,7 @@ proc run_tests {} {
if {$::run_matching ne {} && [string match $::run_matching $test] == 0} {
continue
}
+ if {[file isdirectory $test]} continue
puts [colorstr yellow "Testing unit: [lindex [file split $test] end]"]
source $test
}
Please sign in to comment.
Something went wrong with that request. Please try again.