Skip to content

Commit

Permalink
rename redis.tcl to valkey.tcl
Browse files Browse the repository at this point in the history
Signed-off-by: hwware <[email protected]>
  • Loading branch information
hwware committed Apr 10, 2024
1 parent f8cec23 commit 8536a84
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions tests/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Redis Test Suite
Valkey Test Suite
================

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

The test suite also supports execution against an external server, which is
enabled using the `--host` and `--port` parameters. When executing against an
Expand All @@ -16,7 +16,7 @@ match different external server configurations:
| `--singledb` | Only use database 0, don't assume others are supported. |
| `--ignore-encoding` | Skip all checks for specific encoding. |
| `--ignore-digest` | Skip key value digest validations. |
| `--cluster-mode` | Run in strict Redis Cluster compatibility mode. |
| `--cluster-mode` | Run in strict Valkey Cluster compatibility mode. |
| `--large-memory` | Enables tests that consume more than 100mb |

Tags
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/bg_block_op.tcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source tests/support/redis.tcl
source tests/support/valkey.tcl
source tests/support/util.tcl

set ::tlsdir "tests/tls"
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/bg_complex_data.tcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source tests/support/redis.tcl
source tests/support/valkey.tcl
source tests/support/util.tcl

set ::tlsdir "tests/tls"
Expand Down
2 changes: 1 addition & 1 deletion tests/helpers/gen_write_load.tcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source tests/support/redis.tcl
source tests/support/valkey.tcl

set ::tlsdir "tests/tls"

Expand Down
2 changes: 1 addition & 1 deletion tests/instances.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
package require Tcl 8.5

set tcl_precision 17
source ../support/redis.tcl
source ../support/valkey.tcl
source ../support/util.tcl
source ../support/aofmanifest.tcl
source ../support/server.tcl
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions tests/test_helper.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package require Tcl 8.5

set tcl_precision 17
source tests/support/redis.tcl
source tests/support/valkey.tcl
source tests/support/aofmanifest.tcl
source tests/support/server.tcl
source tests/support/cluster_util.tcl
Expand Down Expand Up @@ -501,7 +501,7 @@ proc kill_clients {} {

proc force_kill_all_servers {} {
foreach p $::active_servers {
puts "Killing still running Redis server $p"
puts "Killing still running Valkey server $p"
catch {exec kill -9 $p}
}
}
Expand Down Expand Up @@ -628,20 +628,20 @@ proc print_help_screen {} {
"--skipfile <file> Name of a file containing test names or regexp patterns (if <test> starts with '/') that should be skipped (one per line). This option can be repeated."
"--skiptest <test> Test name or regexp pattern (if <test> starts with '/') to skip. This option can be repeated."
"--tags <tags> Run only tests having specified tags or not having '-' prefixed tags."
"--dont-clean Don't delete redis log files after the run."
"--dont-pre-clean Don't delete existing redis log files before the run."
"--dont-clean Don't delete valkey log files after the run."
"--dont-pre-clean Don't delete existing valkey log files before the run."
"--no-latency Skip latency measurements and validation by some tests."
"--stop Blocks once the first test fails."
"--loop Execute the specified set of tests forever."
"--loops <count> Execute the specified set of tests several times."
"--wait-server Wait after server is started (so that you can attach a debugger)."
"--dump-logs Dump server log on test failure."
"--tls Run tests in TLS mode."
"--tls-module Run tests in TLS mode with Redis module."
"--tls-module Run tests in TLS mode with Valkey module."
"--host <addr> Run tests against an external host."
"--port <port> TCP port to use against external host."
"--baseport <port> Initial port number for spawned redis servers."
"--portcount <num> Port range for spawned redis servers."
"--baseport <port> Initial port number for spawned valkey servers."
"--portcount <num> Port range for spawned valkey servers."
"--singledb Use a single database, avoid SELECT."
"--cluster-mode Run tests in cluster protocol compatible mode."
"--ignore-encoding Don't validate object encoding."
Expand Down
14 changes: 7 additions & 7 deletions utils/speed-regression.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Copyright (C) 2011 Salvatore Sanfilippo
# Released under the BSD license like Redis itself

source ../tests/support/redis.tcl
source ../tests/support/valkey.tcl
set ::port 12123
set ::tests {PING,SET,GET,INCR,LPUSH,LPOP,SADD,SPOP,LRANGE_100,LRANGE_600,MSET}
set ::datasize 16
Expand All @@ -20,25 +20,25 @@ proc run-tests branches {
exec -ignorestderr make 2> /dev/null

if {$branch_id == 0} {
puts " copy redis-benchmark from unstable to /tmp..."
exec -ignorestderr cp ./redis-benchmark /tmp
puts " copy valkey-benchmark from unstable to /tmp..."
exec -ignorestderr cp ./valkey-benchmark /tmp
incr branch_id
continue
}

# Start the server
puts " starting the server... [exec ./redis-server -v]"
set pids [exec echo "port $::port\nloglevel warning\n" | ./redis-server - > /dev/null 2> /dev/null &]
puts " starting the server... [exec ./valkey-server -v]"
set pids [exec echo "port $::port\nloglevel warning\n" | ./valkey-server - > /dev/null 2> /dev/null &]
puts " pids: $pids"
after 1000
puts " running the benchmark"

set r [redis 127.0.0.1 $::port]
set i [$r info]
puts " redis INFO shows version: [lindex [split $i] 0]"
puts " valkey INFO shows version: [lindex [split $i] 0]"
$r close

set output [exec /tmp/redis-benchmark -n $::requests -t $::tests -d $::datasize --csv -p $::port]
set output [exec /tmp/valkey-benchmark -n $::requests -t $::tests -d $::datasize --csv -p $::port]
lappend runs $b $output
puts " killing server..."
catch {exec kill -9 [lindex $pids 0]}
Expand Down

0 comments on commit 8536a84

Please sign in to comment.