summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2016-12-19 16:49:58 +0100
committerantirez <antirez@gmail.com>2016-12-19 16:49:58 +0100
commit8444b46d20ef9c8de3f7e255e4f3bfa44f509c77 (patch)
tree5c12797df7549ee1fd981fec82234b72cb5bba9c
parent074383f8509daf86d490df967c5f0fca91bf96e9 (diff)
downloadredis-8444b46d20ef9c8de3f7e255e4f3bfa44f509c77.tar.gz
Fix test "server is up" detection after logging changes.
-rw-r--r--tests/assets/default.conf1
-rw-r--r--tests/support/server.tcl2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/assets/default.conf b/tests/assets/default.conf
index 81f8470bc..d7b8a75c6 100644
--- a/tests/assets/default.conf
+++ b/tests/assets/default.conf
@@ -1,5 +1,6 @@
# Redis configuration for testing.
+always-show-logo yes
notify-keyspace-events KEA
daemonize no
pidfile /var/run/redis.pid
diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 19d6c5152..c36b30775 100644
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -278,7 +278,7 @@ proc start_server {options {code undefined}} {
while 1 {
# check that the server actually started and is ready for connections
- if {[exec grep "ready to accept" | wc -l < $stdout] > 0} {
+ if {[exec grep -i "Ready to accept" | wc -l < $stdout] > 0} {
break
}
after 10