fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-12 16:51:22 +00:00
Code Issues Projects Releases Wiki Activity

Slave removal: remove slave from top-level tests descriptions.

Browse Source
This commit is contained in:
antirez
2018-09-11 10:57:50 +02:00
parent 0c1d28e2d0
commit 52e7192e4a
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/unit/scripting.tcl
View File

@ -542,7 +542,7 @@ foreach cmdrepl {0 1} {
r debug lua-always-replicate-commands 1
}
test "Before the slave connects we issue two EVAL commands $rt" {
test "Before the replica connects we issue two EVAL commands $rt" {
# One with an error, but still executing a command.
# SHA is: 67164fc43fa971f76fd1aaeeaf60c1c178d25876
catch {
@ -553,13 +553,13 @@ foreach cmdrepl {0 1} {
r eval {return redis.call('incr',KEYS[1])} 1 x
} {2}
test "Connect a slave to the master instance $rt" {
test "Connect a replica to the master instance $rt" {
r -1 slaveof [srv 0 host] [srv 0 port]
wait_for_condition 50 100 {
[s -1 role] eq {slave} &&
[string match {*master_link_status:up*} [r -1 info replication]]
} else {
fail "Can't turn the instance into a slave"
fail "Can't turn the instance into a replica"
}
}
@ -592,7 +592,7 @@ foreach cmdrepl {0 1} {
wait_for_condition 50 100 {
[r -1 lrange a 0 -1] eq [r lrange a 0 -1]
} else {
fail "Expected list 'a' in slave and master to be the same, but they are respectively '[r -1 lrange a 0 -1]' and '[r lrange a 0 -1]'"
fail "Expected list 'a' in replica and master to be the same, but they are respectively '[r -1 lrange a 0 -1]' and '[r lrange a 0 -1]'"
}
set res
} {a 1}
@ -627,7 +627,7 @@ foreach cmdrepl {0 1} {
wait_for_condition 50 100 {
[r -1 debug digest] eq [r debug digest]
} else {
fail "Master-Slave desync after Lua script using SELECT."
fail "Master-Replica desync after Lua script using SELECT."
}
}
}
@ -636,13 +636,13 @@ foreach cmdrepl {0 1} {
start_server {tags {"scripting repl"}} {
start_server {overrides {appendonly yes aof-use-rdb-preamble no}} {
test "Connect a slave to the master instance" {
test "Connect a replica to the master instance" {
r -1 slaveof [srv 0 host] [srv 0 port]
wait_for_condition 50 100 {
[s -1 role] eq {slave} &&
[string match {*master_link_status:up*} [r -1 info replication]]
} else {
fail "Can't turn the instance into a slave"
fail "Can't turn the instance into a replica"
}
}
@ -696,7 +696,7 @@ start_server {tags {"scripting repl"}} {
wait_for_condition 50 100 {
[r -1 mget a b c d] eq {1 {} {} 4}
} else {
fail "Only a and c should be replicated to slave"
fail "Only a and c should be replicated to replica"
}
# Master should have everything right now
@ -735,7 +735,7 @@ start_server {tags {"scripting repl"}} {
wait_for_condition 50 100 {
[r get time] eq [r -1 get time]
} else {
fail "Time key does not match between master and slave"
fail "Time key does not match between master and replica"
}
}
}