Skip to content

Commit 669f1d3

Browse files
redisbenchmark to valkeybenchmark in test directory and some test name rename. (#347)
This pr covers following chnages. 1. redisbenchmark to valkeybenchmark in test directory 2. Removed redis from some test's title and changed the name accordingly. 3. Updated test suite name and redis-server to valkey readme in test directory. --------- Signed-off-by: Shivshankar-Reddy <[email protected]>
1 parent f0e1edc commit 669f1d3

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

tests/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Redis Test Suite
2-
================
1+
Valkey Test Suite
2+
=================
33

44
The normal execution mode of the test suite involves starting and manipulating
5-
local `redis-server` instances, inspecting process state, log files, etc.
5+
local `valkey-server` instances, inspecting process state, log files, etc.
66

77
The test suite also supports execution against an external server, which is
88
enabled using the `--host` and `--port` parameters. When executing against an

tests/integration/aof.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ tags {"aof external:skip"} {
202202
}
203203

204204
start_server {overrides {appendonly {yes}}} {
205-
test {Redis should not try to convert DEL into EXPIREAT for EXPIRE -1} {
205+
test {Server should not try to convert DEL into EXPIREAT for EXPIRE -1} {
206206
r set x 10
207207
r expire x -1
208208
}

tests/integration/valkey-benchmark.tcl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,26 @@ tags {"benchmark network external:skip logreqres:skip"} {
3232
r select 0
3333

3434
test {benchmark: set,get} {
35-
set cmd [redisbenchmark $master_host $master_port "-c 5 -n 10 -t set,get"]
35+
set cmd [valkeybenchmark $master_host $master_port "-c 5 -n 10 -t set,get"]
3636
common_bench_setup $cmd
3737
default_set_get_checks
3838
}
3939

4040
test {benchmark: connecting using URI set,get} {
41-
set cmd [redisbenchmarkuri $master_host $master_port "-c 5 -n 10 -t set,get"]
41+
set cmd [valkeybenchmarkuri $master_host $master_port "-c 5 -n 10 -t set,get"]
4242
common_bench_setup $cmd
4343
default_set_get_checks
4444
}
4545

4646
test {benchmark: connecting using URI with authentication set,get} {
4747
r config set masterauth pass
48-
set cmd [redisbenchmarkuriuserpass $master_host $master_port "default" pass "-c 5 -n 10 -t set,get"]
48+
set cmd [valkeybenchmarkuriuserpass $master_host $master_port "default" pass "-c 5 -n 10 -t set,get"]
4949
common_bench_setup $cmd
5050
default_set_get_checks
5151
}
5252

5353
test {benchmark: full test suite} {
54-
set cmd [redisbenchmark $master_host $master_port "-c 10 -n 100"]
54+
set cmd [valkeybenchmark $master_host $master_port "-c 10 -n 100"]
5555
common_bench_setup $cmd
5656

5757
# ping total calls are 2*issued commands per test due to PING_INLINE and PING_MBULK
@@ -76,7 +76,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
7676
}
7777

7878
test {benchmark: multi-thread set,get} {
79-
set cmd [redisbenchmark $master_host $master_port "--threads 10 -c 5 -n 10 -t set,get"]
79+
set cmd [valkeybenchmark $master_host $master_port "--threads 10 -c 5 -n 10 -t set,get"]
8080
common_bench_setup $cmd
8181
default_set_get_checks
8282

@@ -85,7 +85,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
8585
}
8686

8787
test {benchmark: pipelined full set,get} {
88-
set cmd [redisbenchmark $master_host $master_port "-P 5 -c 10 -n 10010 -t set,get"]
88+
set cmd [valkeybenchmark $master_host $master_port "-P 5 -c 10 -n 10010 -t set,get"]
8989
common_bench_setup $cmd
9090
assert_match {*calls=10010,*} [cmdstat set]
9191
assert_match {*calls=10010,*} [cmdstat get]
@@ -97,7 +97,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
9797
}
9898

9999
test {benchmark: arbitrary command} {
100-
set cmd [redisbenchmark $master_host $master_port "-c 5 -n 150 INCRBYFLOAT mykey 10.0"]
100+
set cmd [valkeybenchmark $master_host $master_port "-c 5 -n 150 INCRBYFLOAT mykey 10.0"]
101101
common_bench_setup $cmd
102102
assert_match {*calls=150,*} [cmdstat incrbyfloat]
103103
# assert one of the non benchmarked commands is not present
@@ -108,7 +108,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
108108
}
109109

110110
test {benchmark: keyspace length} {
111-
set cmd [redisbenchmark $master_host $master_port "-r 50 -t set -n 1000"]
111+
set cmd [valkeybenchmark $master_host $master_port "-r 50 -t set -n 1000"]
112112
common_bench_setup $cmd
113113
assert_match {*calls=1000,*} [cmdstat set]
114114
# assert one of the non benchmarked commands is not present
@@ -119,7 +119,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
119119
}
120120

121121
test {benchmark: clients idle mode should return error when reached maxclients limit} {
122-
set cmd [redisbenchmark $master_host $master_port "-c 10 -I"]
122+
set cmd [valkeybenchmark $master_host $master_port "-c 10 -I"]
123123
set original_maxclients [lindex [r config get maxclients] 1]
124124
r config set maxclients 5
125125
catch { exec {*}$cmd } error
@@ -128,7 +128,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
128128
}
129129

130130
test {benchmark: read last argument from stdin} {
131-
set base_cmd [redisbenchmark $master_host $master_port "-x -n 10 set key"]
131+
set base_cmd [valkeybenchmark $master_host $master_port "-x -n 10 set key"]
132132
set cmd "printf arg | $base_cmd"
133133
common_bench_setup $cmd
134134
r get key
@@ -137,7 +137,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
137137
# tls specific tests
138138
if {$::tls} {
139139
test {benchmark: specific tls-ciphers} {
140-
set cmd [redisbenchmark $master_host $master_port "-r 50 -t set -n 1000 --tls-ciphers \"DEFAULT:-AES128-SHA256\""]
140+
set cmd [valkeybenchmark $master_host $master_port "-r 50 -t set -n 1000 --tls-ciphers \"DEFAULT:-AES128-SHA256\""]
141141
common_bench_setup $cmd
142142
assert_match {*calls=1000,*} [cmdstat set]
143143
# assert one of the non benchmarked commands is not present
@@ -146,7 +146,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
146146

147147
test {benchmark: tls connecting using URI with authentication set,get} {
148148
r config set masterauth pass
149-
set cmd [redisbenchmarkuriuserpass $master_host $master_port "default" pass "-c 5 -n 10 -t set,get"]
149+
set cmd [valkeybenchmarkuriuserpass $master_host $master_port "default" pass "-c 5 -n 10 -t set,get"]
150150
common_bench_setup $cmd
151151
default_set_get_checks
152152
}
@@ -155,7 +155,7 @@ tags {"benchmark network external:skip logreqres:skip"} {
155155
r flushall
156156
r config resetstat
157157
set ciphersuites_supported 1
158-
set cmd [redisbenchmark $master_host $master_port "-r 50 -t set -n 1000 --tls-ciphersuites \"TLS_AES_128_GCM_SHA256\""]
158+
set cmd [valkeybenchmark $master_host $master_port "-r 50 -t set -n 1000 --tls-ciphersuites \"TLS_AES_128_GCM_SHA256\""]
159159
if {[catch { exec {*}$cmd } error]} {
160160
set first_line [lindex [split $error "\n"] 0]
161161
if {[string match "*Invalid option*" $first_line]} {

tests/support/benchmark.tcl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
proc redisbenchmark_tls_config {testsdir} {
1+
proc valkeybenchmark_tls_config {testsdir} {
22
set tlsdir [file join $testsdir tls]
33
set cert [file join $tlsdir client.crt]
44
set key [file join $tlsdir client.key]
@@ -11,23 +11,23 @@ proc redisbenchmark_tls_config {testsdir} {
1111
}
1212
}
1313

14-
proc redisbenchmark {host port {opts {}}} {
14+
proc valkeybenchmark {host port {opts {}}} {
1515
set cmd [list src/valkey-benchmark -h $host -p $port]
16-
lappend cmd {*}[redisbenchmark_tls_config "tests"]
16+
lappend cmd {*}[valkeybenchmark_tls_config "tests"]
1717
lappend cmd {*}$opts
1818
return $cmd
1919
}
2020

21-
proc redisbenchmarkuri {host port {opts {}}} {
21+
proc valkeybenchmarkuri {host port {opts {}}} {
2222
set cmd [list src/valkey-benchmark -u valkey://$host:$port]
23-
lappend cmd {*}[redisbenchmark_tls_config "tests"]
23+
lappend cmd {*}[valkeybenchmark_tls_config "tests"]
2424
lappend cmd {*}$opts
2525
return $cmd
2626
}
2727

28-
proc redisbenchmarkuriuserpass {host port user pass {opts {}}} {
28+
proc valkeybenchmarkuriuserpass {host port user pass {opts {}}} {
2929
set cmd [list src/valkey-benchmark -u valkey://$user:$pass@$host:$port]
30-
lappend cmd {*}[redisbenchmark_tls_config "tests"]
30+
lappend cmd {*}[valkeybenchmark_tls_config "tests"]
3131
lappend cmd {*}$opts
3232
return $cmd
3333
}

tests/unit/expire.tcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ start_server {tags {"expire"}} {
181181
assert_equal [r pexpiretime x] $abs_expire
182182
}
183183

184-
test {Redis should actively expire keys incrementally} {
184+
test {Server should actively expire keys incrementally} {
185185
r flushdb
186186
r psetex key1 500 a
187187
r psetex key2 500 a
@@ -197,7 +197,7 @@ start_server {tags {"expire"}} {
197197
}
198198
}
199199

200-
test {Redis should lazy expire keys} {
200+
test {Server should lazy expire keys} {
201201
r flushdb
202202
r debug set-active-expire 0
203203
r psetex key1{t} 500 a
@@ -768,7 +768,7 @@ start_server {tags {"expire"}} {
768768
assert_equal [r EXPIRE none 100 LT] 0
769769
} {}
770770

771-
test {Redis should not propagate the read command on lazy expire} {
771+
test {Server should not propagate the read command on lazy expire} {
772772
r debug set-active-expire 0
773773
r flushall ; # Clean up keyspace to avoid interference by keys from other tests
774774
r set foo bar PX 1

tests/unit/hyperloglog.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ start_server {tags {"hll"}} {
146146
set e
147147
} {*WRONGTYPE*}
148148

149-
test {Fuzzing dense/sparse encoding: Redis should always detect errors} {
149+
test {Fuzzing dense/sparse encoding: Server should always detect errors} {
150150
for {set j 0} {$j < 1000} {incr j} {
151151
r del hll
152152
set items {}

tests/unit/scripting.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@ start_server {tags {"scripting repl external:skip"}} {
14401440
set e
14411441
} {*Invalid*flags*}
14421442

1443-
test "Test selective replication of certain Redis commands from Lua" {
1443+
test "Test selective replication of certain commands from Lua" {
14441444
r del a b c d
14451445
run_script {
14461446
redis.call('set','a','1');

0 commit comments

Comments
 (0)