From f80f3f492a0ca56e163899eeca7ad40d67d903be Mon Sep 17 00:00:00 2001
From: Yossi Gottlieb <yossigo@gmail.com>
Date: Sun, 23 Aug 2020 10:17:43 +0300
Subject: [PATCH] Tests: fix redis-cli with remote hosts. (#7693)
---
tests/integration/redis-cli.tcl | 4 ++--
tests/support/cli.tcl | 4 ++--
tests/unit/wait.tcl | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/integration/redis-cli.tcl b/tests/integration/redis-cli.tcl
index 44ff430e2..2d4145ff0 100644
--- a/tests/integration/redis-cli.tcl
+++ b/tests/integration/redis-cli.tcl
@@ -3,7 +3,7 @@ source tests/support/cli.tcl
start_server {tags {"cli"}} {
proc open_cli {{opts "-n 9"} {infile ""}} {
set ::env(TERM) dumb
- set cmdline [rediscli [srv port] $opts]
+ set cmdline [rediscli [srv host] [srv port] $opts]
if {$infile ne ""} {
set cmdline "$cmdline < $infile"
set mode "r"
@@ -65,7 +65,7 @@ start_server {tags {"cli"}} {
}
proc _run_cli {opts args} {
- set cmd [rediscli [srv port] [list -n 9 {*}$args]]
+ set cmd [rediscli [srv host] [srv port] [list -n 9 {*}$args]]
foreach {key value} $opts {
if {$key eq "pipe"} {
set cmd "sh -c \"$value | $cmd\""
diff --git a/tests/support/cli.tcl b/tests/support/cli.tcl
index 37c902a50..d55487931 100644
--- a/tests/support/cli.tcl
+++ b/tests/support/cli.tcl
@@ -11,8 +11,8 @@ proc rediscli_tls_config {testsdir} {
}
}
-proc rediscli {port {opts {}}} {
- set cmd [list src/redis-cli -p $port]
+proc rediscli {host port {opts {}}} {
+ set cmd [list src/redis-cli -h $host -p $port]
lappend cmd {*}[rediscli_tls_config "tests"]
lappend cmd {*}$opts
return $cmd
diff --git a/tests/unit/wait.tcl b/tests/unit/wait.tcl
index c9cfa6ed4..b1500cff8 100644
--- a/tests/unit/wait.tcl
+++ b/tests/unit/wait.tcl
@@ -33,7 +33,7 @@ start_server {} {
}
test {WAIT should not acknowledge 1 additional copy if slave is blocked} {
- set cmd [rediscli $slave_port "-h $slave_host debug sleep 5"]
+ set cmd [rediscli $slave_host $slave_port "debug sleep 5"]
exec {*}$cmd > /dev/null 2> /dev/null &
after 1000 ;# Give redis-cli the time to execute the command.
$master set foo 0