Skip to content

Commit

Permalink
Use 'primary(s)' instead of 'master(s)' in Sentinel tcl testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
z00808363 committed Jul 1, 2024
1 parent ee1512f commit 886f36f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tests/sentinel/tests/00-base.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ test "SENTINEL PENDING-SCRIPTS returns the information about pending scripts" {
assert_morethan_equal [llength [S 0 SENTINEL PENDING-SCRIPTS]] 0
}

test "SENTINEL MASTERS returns a list of monitored masters" {
test "SENTINEL PRIMARYS returns a list of monitored primarys" {
assert_match "*mymaster*" [S 0 SENTINEL MASTERS]
assert_morethan_equal [llength [S 0 SENTINEL MASTERS]] 1
}
Expand Down
2 changes: 1 addition & 1 deletion tests/sentinel/tests/03-runtime-reconf.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ proc wait_for_sentinels_connect_servers { {is_connect 1} } {
}
}

test "Sentinels (re)connection following SENTINEL SET mymaster auth-pass" {
test "Sentinels (re)connection following SENTINEL SET myprimary auth-pass" {
# 3 types of sentinels to test:
# (re)started while master changed pwd. Manage to connect only after setting pwd
set sent2re 0
Expand Down
2 changes: 1 addition & 1 deletion tests/sentinel/tests/07-down-conditions.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ test "SDOWN is triggered by crashed instance" {
ensure_master_up
}

test "SDOWN is triggered by masters advertising as slaves" {
test "SDOWN is triggered by primarys advertising as slaves" {
ensure_master_up
R 0 slaveof 127.0.0.1 34567
ensure_master_down
Expand Down
2 changes: 1 addition & 1 deletion tests/sentinel/tests/includes/init-tests.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test "(init) Remove old primary entry from sentinels" {
}

set redis_slaves [expr $::instances_count - 1]
test "(init) Create a master-slaves cluster of [expr $redis_slaves+1] instances" {
test "(init) Create a primary-slaves cluster of [expr $redis_slaves+1] instances" {
create_valkey_master_slave_cluster [expr {$redis_slaves+1}]
}
set master_id 0
Expand Down

0 comments on commit 886f36f

Please sign in to comment.