Replace "redis" with "valkey" test code #287
Conversation
Signed-off-by: Shivshankar-Reddy <[email protected]>
Signed-off-by: Shivshankar-Reddy <[email protected]>
Signed-off-by: Shivshankar-Reddy <[email protected]>
Signed-off-by: Shivshankar-Reddy <[email protected]>
|
@enjoy-binbin @zuiderkwast I have changed most of redis to valkey in this PR, I tried changing meaningfull names but it gave lot of trouble and test case failure so I went with replacing redis with "valkey". If you have some time could you please have a look at this? |
src/cli_common.c
Outdated
| const char *scheme = "redis://"; | ||
| const char *tlsscheme = "rediss://"; | ||
| const char *scheme = "valkey://"; | ||
| const char *tlsscheme = "valkeys://"; | ||
| const char *curr = uri; |
There was a problem hiding this comment.
I'm not sure #198 will get merged at all.
Either way, I think we should test the redis:// protocol to make sure we support it. We want valkey-cli 8.0 to be compatible with valkey-server 7.2.x and with redis oss.
There was a problem hiding this comment.
Ohh.. Do we have any macro or check for backport compatibilty defined, I can go ahead update the commit in this pr or first I will commit them in different PR as they are going to be breaking changes and later we can focus on this PR changes. WDYT?
There was a problem hiding this comment.
I think just keep redis:// and rediss:// in this PR. Only update internal names in the test.
We are sure we want to support it and still test it.
We are not yet sure if we want to add another scheme. If we do, we want to test both.
There was a problem hiding this comment.
thank you for the details, sure I will change internally in test and commit again!
There was a problem hiding this comment.
Completed the changes and updated tests as well to pass now, when scheme is added we can change those test together. Thanks!
Signed-off-by: Shivshankar-Reddy <[email protected]>
Thank you @enjoy-binbin , I will look into it and fix. |
There was a problem hiding this comment.
Very good. I will merge it before there are new merge conflicts. :)
Just to be clear what this PR is doing.
I can see only lowercase "redis" is replaced by "valkey".
It does not change "Redis" (in the output of ./runtest --help) but we can do that in another PR.
It also does not rename any files. We can do that in another PR too. (Rename redis.tcl to valkey.tcl.)
zuiderkwast
changed the title
Hi @enjoy-binbin , The failures happen on Mac OS workflows and I dont have Mac book so I have tried replicate the same tests on Ubuntu machine for multiple times and I could not replicate them. From the logs we could see below tests failed.
We may need help fom someone who has Mac and test this cases and see whether its related to CI or fails on manual run as well.. |
Occurrences of "redis" in TCL test suites and helpers, such as TCL client used in tests, are replaced with "valkey". Occurrences of uppercase "Redis" are not changed in this PR. No files are renamed in this PR. --------- Signed-off-by: Shivshankar-Reddy <[email protected]>
Renamed below procedures and variables (missed in #287) as follows. redis_cluster -> valkey_cluster redis1 -> valkey1 redis2 -> valkey2 get_redis_dir -> get_valkey_dir test_redis_cli_rdb_dump -> test_valkey_cli_rdb_dump test_redis_cli_repl -> test_valkey_cli_repl redis-cli -> valkey-cli redis_reset_state -> valkey_reset_state redisHandle -> valkeyHandle redis_safe_read -> valkey_safe_read redis_safe_gets -> valkey_safe_gets redis_write -> valkey_write redis_read_reply -> valkey_read_reply redis_readable -> valkey_readable redis_readnl -> valkey_readnl redis_writenl -> valkey_writenl redis_read_map -> valkey_read_map redis_read_line -> valkey_read_line redis_read_null -> valkey_read_null redis_read_bool -> valkey_read_bool redis_read_double -> valkey_read_double redis_read_verbatim_str -> valkey_read_verbatim_str redis_call_callback -> valkey_call_callback --------- Signed-off-by: Shivshankar-Reddy <[email protected]>
Renamed below procedures and variables (missed in valkey-io#287) as follows. redis_cluster -> valkey_cluster redis1 -> valkey1 redis2 -> valkey2 get_redis_dir -> get_valkey_dir test_redis_cli_rdb_dump -> test_valkey_cli_rdb_dump test_redis_cli_repl -> test_valkey_cli_repl redis-cli -> valkey-cli redis_reset_state -> valkey_reset_state redisHandle -> valkeyHandle redis_safe_read -> valkey_safe_read redis_safe_gets -> valkey_safe_gets redis_write -> valkey_write redis_read_reply -> valkey_read_reply redis_readable -> valkey_readable redis_readnl -> valkey_readnl redis_writenl -> valkey_writenl redis_read_map -> valkey_read_map redis_read_line -> valkey_read_line redis_read_null -> valkey_read_null redis_read_bool -> valkey_read_bool redis_read_double -> valkey_read_double redis_read_verbatim_str -> valkey_read_verbatim_str redis_call_callback -> valkey_call_callback --------- Signed-off-by: Shivshankar-Reddy <[email protected]> Signed-off-by: Sher Sun <[email protected]>
Occurrences of "redis" in TCL test suites and helpers, such as TCL client used in tests, are replaced with "valkey".
Occurrences of uppercase "Redis" are not changed in this PR.
No files are renamed in this PR.