thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

[PORT] Add cache test for admins (#31265)

Browse source 
* the cache was not refactored in Forgejo
* fix the test modifying a global variable
This commit is contained in:
Earl Warren 2024-06-23 11:38:35 +02:00
parent 77da92f42a
commit 9c48511c69
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/cache/cache.go vendored
View file

@ -6,6 +6,7 @@ package cache
import ( import (
"fmt" "fmt"
"strconv" "strconv"
"time"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
@ -46,7 +47,7 @@ const (
) )
func Test() (time.Duration, error) { func Test() (time.Duration, error) {
if defaultCache == nil { if conn == nil {
return 0, fmt.Errorf("default cache not initialized") return 0, fmt.Errorf("default cache not initialized")
} }
@ -54,14 +55,14 @@ func Test() (time.Duration, error) {
start := time.Now() 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) 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) return 0, fmt.Errorf("expect cache to store data but got: %w", err)
} }
testVal, hit := defaultCache.Get(testCacheKey) testVal := conn.Get(testCacheKey)
if !hit { if testVal == nil {
return 0, fmt.Errorf("expect cache hit but got none") return 0, fmt.Errorf("expect cache hit but got none")
} }
if testVal != testData { if testVal != testData {

3
modules/cache/cache_test.go vendored
View file

@ -9,6 +9,7 @@ import (
"time" "time"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -35,7 +36,7 @@ func TestNewContext(t *testing.T) {
} }
func TestTest(t *testing.T) { func TestTest(t *testing.T) {
defaultCache = nil defer test.MockVariableValue(&conn, nil)()
_, err := Test() _, err := Test()
assert.Error(t, err) assert.Error(t, err)