From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 2 Dec 2021 17:41:24 +0000 (-0600)
Subject: Fixup cache redis tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e24a7383ad4f4546c53a661352018d611275b9dd;p=thirdparty%2Ffreeradius-server.git

Fixup cache redis tests
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07df5a59aaa..ebdcee1e513 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -313,6 +313,7 @@ jobs:
 #       SMTP_TEST_SERVER_PORT: 2525
         REDIS_TEST_SERVER: 127.0.0.1
         REDIS_IPPOOL_TEST_SERVER: 127.0.0.1
+        CACHE_REDIS_TEST_SERVER: 127.0.0.1
 #       IMAP_TEST_SERVER: 127.0.0.1
 #       IMAP_TEST_SERVER_PORT: 1430
 #       IMAP_TEST_SERVER_SSL_PORT: 1431
diff --git a/src/tests/modules/cache_redis/all.mk b/src/tests/modules/cache_redis/all.mk
index 6060444c56d..40abf1feb83 100644
--- a/src/tests/modules/cache_redis/all.mk
+++ b/src/tests/modules/cache_redis/all.mk
@@ -1,7 +1,7 @@
 #
 #  Test the "redis" module
 #
-redis_rbtree.test:
+cache_redis.test:
 
 # Don't test redis if REDIS_TEST_SERVER ENV is not set
-redis_require_test_server := 1
+cache_redis_require_test_server := 1
diff --git a/src/tests/modules/cache_redis/module.conf b/src/tests/modules/cache_redis/module.conf
index 90f351b7617..27b2bff4c2e 100644
--- a/src/tests/modules/cache_redis/module.conf
+++ b/src/tests/modules/cache_redis/module.conf
@@ -3,12 +3,12 @@ cache {
 	driver = "rlm_cache_redis"
 
 	redis {
-		server = $ENV{REDIS_TEST_SERVER}:30001
-		server = $ENV{REDIS_TEST_SERVER}:30002
-		server = $ENV{REDIS_TEST_SERVER}:30003
-		server = $ENV{REDIS_TEST_SERVER}:30004
-		server = $ENV{REDIS_TEST_SERVER}:30005
-		server = $ENV{REDIS_TEST_SERVER}:30006
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30001
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30002
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30003
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30004
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30005
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30006
 	}
 
 	key = "$ENV{MODULE_TEST_UNLANG}%{Tmp-String-0}"
@@ -27,12 +27,12 @@ cache cache_update {
 	driver = "rlm_cache_redis"
 
 	redis {
-		server = $ENV{REDIS_TEST_SERVER}:30001
-		server = $ENV{REDIS_TEST_SERVER}:30002
-		server = $ENV{REDIS_TEST_SERVER}:30003
-		server = $ENV{REDIS_TEST_SERVER}:30004
-		server = $ENV{REDIS_TEST_SERVER}:30005
-		server = $ENV{REDIS_TEST_SERVER}:30006
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30001
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30002
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30003
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30004
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30005
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30006
 	}
 
 	key = "$ENV{MODULE_TEST_UNLANG}%{Tmp-String-0}"
@@ -77,12 +77,12 @@ cache cache_bin_key_octets {
 	driver = "rlm_cache_redis"
 
 	redis {
-		server = $ENV{REDIS_TEST_SERVER}:30001
-		server = $ENV{REDIS_TEST_SERVER}:30002
-		server = $ENV{REDIS_TEST_SERVER}:30003
-		server = $ENV{REDIS_TEST_SERVER}:30004
-		server = $ENV{REDIS_TEST_SERVER}:30005
-		server = $ENV{REDIS_TEST_SERVER}:30006
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30001
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30002
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30003
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30004
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30005
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30006
 	}
 
 	key = &Tmp-Octets-0
@@ -97,12 +97,12 @@ cache cache_bin_key_ipaddr {
 	driver = "rlm_cache_redis"
 
 	redis {
-		server = $ENV{REDIS_TEST_SERVER}:30001
-		server = $ENV{REDIS_TEST_SERVER}:30002
-		server = $ENV{REDIS_TEST_SERVER}:30003
-		server = $ENV{REDIS_TEST_SERVER}:30004
-		server = $ENV{REDIS_TEST_SERVER}:30005
-		server = $ENV{REDIS_TEST_SERVER}:30006
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30001
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30002
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30003
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30004
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30005
+		server = $ENV{CACHE_REDIS_TEST_SERVER}:30006
 	}
 
 	key = &Tmp-IP-Address-0