From d568a73ab82aaa28077842bbff2b46dd46d6fd55 Mon Sep 17 00:00:00 2001 From: Jo Date: Mon, 15 May 2023 10:30:41 +0200 Subject: [PATCH] fix(metadata): reduce cache validity (#2161) fix metadata cache validity too long --- pkg/settings/runtime.go | 2 -- pkg/settings/runtime_test.go | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 pkg/settings/runtime_test.go diff --git a/pkg/settings/runtime.go b/pkg/settings/runtime.go index 722671a7..275da79c 100644 --- a/pkg/settings/runtime.go +++ b/pkg/settings/runtime.go @@ -6,7 +6,6 @@ import ( "net/http" "os" "path/filepath" - "time" "github.com/leonelquinteros/gotext" @@ -69,7 +68,6 @@ func BuildRuntime(cfg *Configuration, cmdArgs *parser.Arguments, version string) metadata.WithCacheFilePath(filepath.Join(cfg.BuildDir, "aur.json")), metadata.WithRequestEditorFn(userAgentFn), metadata.WithBaseURL(cfg.AURURL), - metadata.WithCustomCacheValidity(100000*time.Hour), metadata.WithDebugLogger(logger.Debugln), ) if errAURCache != nil { diff --git a/pkg/settings/runtime_test.go b/pkg/settings/runtime_test.go new file mode 100644 index 00000000..84f8369f --- /dev/null +++ b/pkg/settings/runtime_test.go @@ -0,0 +1,44 @@ +package settings_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/Jguer/yay/v12/pkg/settings" + "github.com/Jguer/yay/v12/pkg/settings/parser" + "github.com/Jguer/yay/v12/pkg/text" +) + +func TestBuildRuntime(t *testing.T) { + t.Parallel() + // Prepare test inputs + cfg := &settings.Configuration{ + Debug: true, + UseRPC: false, + AURURL: "https://aur.archlinux.org", + AURRPCURL: "https://aur.archlinux.org/rpc", + BuildDir: "/tmp", + VCSFilePath: "", + Runtime: &settings.Runtime{Logger: text.NewLogger(nil, nil, nil, false, "")}, + } + cmdArgs := parser.MakeArguments() + version := "1.0.0" + + // Call the function being tested + runtime, err := settings.BuildRuntime(cfg, cmdArgs, version) + + // Assert the function's output + assert.NotNil(t, runtime) + assert.Nil(t, err) + assert.Nil(t, runtime.QueryBuilder) + assert.Nil(t, runtime.PacmanConf) + assert.NotNil(t, runtime.VCSStore) + assert.NotNil(t, runtime.CmdBuilder) + assert.NotNil(t, runtime.HTTPClient) + assert.NotNil(t, runtime.AURClient) + assert.NotNil(t, runtime.VoteClient) + assert.NotNil(t, runtime.AURCache) + assert.Nil(t, runtime.DBExecutor) + assert.NotNil(t, runtime.Logger) +}