From 29c7fb5f96cd0e2b46792902a132f25abb46e54b Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sat, 22 Aug 2020 14:28:18 -0400
Subject: [PATCH] test-redis fixes

---
 bin/jenkins/redis.conf.hbs | 1 -
 bin/jenkins/test-redis     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/jenkins/redis.conf.hbs b/bin/jenkins/redis.conf.hbs
index b8c819c0..58f4f435 100644
--- a/bin/jenkins/redis.conf.hbs
+++ b/bin/jenkins/redis.conf.hbs
@@ -18,6 +18,5 @@ dir /tmp/redis-{{BUBBLE_REDIS_PORT}}
 lazyfree-lazy-eviction no
 lazyfree-lazy-expire no
 lazyfree-lazy-server-del no
-replica-lazy-flush no
 appendonly no
 appendfilename "appendonly-{{BUBBLE_REDIS_PORT}}.aof"
diff --git a/bin/jenkins/test-redis b/bin/jenkins/test-redis
index d5d428b9..331c1a2c 100755
--- a/bin/jenkins/test-redis
+++ b/bin/jenkins/test-redis
@@ -30,7 +30,7 @@ function start_redis() {
   cat ${THISDIR}/redis.conf.hbs | sed -e "s/{{BUBBLE_REDIS_PORT}}/${port}/g" > ${REDIS_CONF} || die "Error writing redis configuration to ${REDIS_CONF}"
 
   echo "Starting redis..."
-  redis-server ${REDIS_CONF}
+  redis-server ${REDIS_CONF} || die "Error starting redis"
   echo "Redis successfully started on port ${port}"
 }