From 9c48511c696569930f8c529e2e7aa6494faa3aa6 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 23 Jun 2024 11:38:35 +0200
Subject: [PATCH] [PORT] Add cache test for admins (#31265)

* the cache was not refactored in Forgejo
* fix the test modifying a global variable
---
 modules/cache/cache.go      | 11 ++++++-----
 modules/cache/cache_test.go |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/cache/cache.go b/modules/cache/cache.go
index 178af97bbc..546c54dfe1 100644
--- a/modules/cache/cache.go
+++ b/modules/cache/cache.go
@@ -6,6 +6,7 @@ package cache
 import (
 	"fmt"
 	"strconv"
+	"time"
 
 	"code.gitea.io/gitea/modules/setting"
 
@@ -46,7 +47,7 @@ const (
 )
 
 func Test() (time.Duration, error) {
-	if defaultCache == nil {
+	if conn == nil {
 		return 0, fmt.Errorf("default cache not initialized")
 	}
 
@@ -54,14 +55,14 @@ func Test() (time.Duration, error) {
 
 	start := time.Now()
 
-	if err := defaultCache.Delete(testCacheKey); err != nil {
+	if err := conn.Delete(testCacheKey); err != nil {
 		return 0, fmt.Errorf("expect cache to delete data based on key if exist but got: %w", err)
 	}
-	if err := defaultCache.Put(testCacheKey, testData, 10); err != nil {
+	if err := conn.Put(testCacheKey, testData, 10); err != nil {
 		return 0, fmt.Errorf("expect cache to store data but got: %w", err)
 	}
-	testVal, hit := defaultCache.Get(testCacheKey)
-	if !hit {
+	testVal := conn.Get(testCacheKey)
+	if testVal == nil {
 		return 0, fmt.Errorf("expect cache hit but got none")
 	}
 	if testVal != testData {
diff --git a/modules/cache/cache_test.go b/modules/cache/cache_test.go
index d3e108f11e..0e7e7a647c 100644
--- a/modules/cache/cache_test.go
+++ b/modules/cache/cache_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/test"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -35,7 +36,7 @@ func TestNewContext(t *testing.T) {
 }
 
 func TestTest(t *testing.T) {
-	defaultCache = nil
+	defer test.MockVariableValue(&conn, nil)()
 	_, err := Test()
 	assert.Error(t, err)