From c8b16b4d88b2465dfbfc54da5fda951372ff3fa1 Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Mon, 30 Sep 2019 09:58:25 +0200
Subject: [PATCH] Redis: Use temporary redis while testing

---
 connection/redis_test.go | 64 +++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/connection/redis_test.go b/connection/redis_test.go
index 164197b1..628bba71 100644
--- a/connection/redis_test.go
+++ b/connection/redis_test.go
@@ -145,12 +145,16 @@ func TestRDBWrapper_HGetAll(t *testing.T) {
 }
 
 func TestRDBWrapper_HKeys(t *testing.T) {
-	rdb := redis.NewClient(&redis.Options{
-		Addr:         os.Getenv("ICINGADB_TEST_REDIS"),
-		DialTimeout:  time.Minute / 2,
-		ReadTimeout:  time.Minute,
-		WriteTimeout: time.Minute,
-	})
+	var server redisd.Server
+
+	rdb, errSrv := server.Start()
+	if errSrv != nil {
+		t.Fatal(errSrv)
+		return
+	}
+
+	defer server.Stop()
+
 	rdbw := NewTestRDBW(rdb)
 
 	if !rdbw.CheckConnection(true) {
@@ -168,12 +172,16 @@ func TestRDBWrapper_HKeys(t *testing.T) {
 }
 
 func TestRDBWrapper_HMGet(t *testing.T) {
-	rdb := redis.NewClient(&redis.Options{
-		Addr:         os.Getenv("ICINGADB_TEST_REDIS"),
-		DialTimeout:  time.Minute / 2,
-		ReadTimeout:  time.Minute,
-		WriteTimeout: time.Minute,
-	})
+	var server redisd.Server
+
+	rdb, errSrv := server.Start()
+	if errSrv != nil {
+		t.Fatal(errSrv)
+		return
+	}
+
+	defer server.Stop()
+
 	rdbw := NewTestRDBW(rdb)
 
 	if !rdbw.CheckConnection(true) {
@@ -357,12 +365,16 @@ func TestRDBWrapper_TxPipelined(t *testing.T) {
 }
 
 func TestRDBWrapper_PipeConfigChunks(t *testing.T) {
-	rdb := redis.NewClient(&redis.Options{
-		Addr:         os.Getenv("ICINGADB_TEST_REDIS"),
-		DialTimeout:  time.Minute / 2,
-		ReadTimeout:  time.Minute,
-		WriteTimeout: time.Minute,
-	})
+	var server redisd.Server
+
+	rdb, errSrv := server.Start()
+	if errSrv != nil {
+		t.Fatal(errSrv)
+		return
+	}
+
+	defer server.Stop()
+
 	rdbw := NewTestRDBW(rdb)
 
 	if !rdbw.CheckConnection(true) {
@@ -382,12 +394,16 @@ func TestRDBWrapper_PipeConfigChunks(t *testing.T) {
 }
 
 func TestRDBWrapper_PipeChecksumChunks(t *testing.T) {
-	rdb := redis.NewClient(&redis.Options{
-		Addr:         os.Getenv("ICINGADB_TEST_REDIS"),
-		DialTimeout:  time.Minute / 2,
-		ReadTimeout:  time.Minute,
-		WriteTimeout: time.Minute,
-	})
+	var server redisd.Server
+
+	rdb, errSrv := server.Start()
+	if errSrv != nil {
+		t.Fatal(errSrv)
+		return
+	}
+
+	defer server.Stop()
+
 	rdbw := NewTestRDBW(rdb)
 
 	if !rdbw.CheckConnection(true) {