From f9ca590fdf7e4e0c8b1ea37ee9bb838d65348557 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Wed, 18 Mar 2026 17:40:49 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- pkg/app/app.go | 21 +++++++++++++-------- pkg/state/state_test.go | 8 ++++---- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index 8629caac..3a5ee66c 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -640,22 +640,27 @@ func (a *App) ListReleases(c ListConfigProvider) error { err := a.ForEachState(func(run *Run) (_ bool, errs []error) { var stateReleases []*HelmRelease - var err error + var listErr error if !c.SkipCharts() { - err = run.withPreparedCharts("list", state.ChartPrepareOptions{ + prepErr := run.withPreparedCharts("list", state.ChartPrepareOptions{ SkipRepos: true, SkipDeps: true, Concurrency: 2, }, func() { - stateReleases, err = a.list(run) + stateReleases, listErr = a.list(run) }) + if prepErr != nil { + errs = append(errs, prepErr) + } + if listErr != nil { + errs = append(errs, listErr) + } } else { - stateReleases, err = a.list(run) - } - - if err != nil { - errs = append(errs, err) + stateReleases, listErr = a.list(run) + if listErr != nil { + errs = append(errs, listErr) + } } if len(stateReleases) > 0 { diff --git a/pkg/state/state_test.go b/pkg/state/state_test.go index 3db91dd4..b8e62573 100644 --- a/pkg/state/state_test.go +++ b/pkg/state/state_test.go @@ -2548,7 +2548,7 @@ generated: 2019-05-16T15:42:45.50486+09:00 } logger := helmexec.NewLogger(io.Discard, "debug") - basePath := t.TempDir() + basePath := filepath.ToSlash(t.TempDir()) state := &HelmState{ basePath: basePath, FilePath: filepath.Join(basePath, "helmfile.yaml"), @@ -2584,10 +2584,10 @@ generated: 2019-05-16T15:42:45.50486+09:00 } fs := testhelper.NewTestFs(map[string]string{ - "/example/Chart.yaml": `foo: FOO`, - filepath.ToSlash(filepath.Join(basePath, "example/Chart.yaml")): `foo: FOO`, + "/example/Chart.yaml": `foo: FOO`, + filepath.Join(basePath, "example/Chart.yaml"): `foo: FOO`, }) - fs.Cwd = filepath.ToSlash(basePath) + fs.Cwd = basePath state = injectFs(state, fs) errs := state.UpdateDeps(helm, false)