From e901ab7ddd2ee21fa1aa351e78672186755c73b6 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Wed, 18 Mar 2026 16:29:47 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- pkg/app/app.go | 7 +------ pkg/app/app_list_test.go | 12 ++++++------ pkg/state/state_test.go | 6 +++--- 3 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index a52b9983..8629caac 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -643,18 +643,13 @@ func (a *App) ListReleases(c ListConfigProvider) error { var err error if !c.SkipCharts() { - var listErr error err = run.withPreparedCharts("list", state.ChartPrepareOptions{ SkipRepos: true, SkipDeps: true, - SkipResolve: true, Concurrency: 2, }, func() { - stateReleases, listErr = a.list(run) + stateReleases, err = a.list(run) }) - if listErr != nil && err == nil { - err = listErr - } } else { stateReleases, err = a.list(run) } diff --git a/pkg/app/app_list_test.go b/pkg/app/app_list_test.go index acf4e342..9fbb4644 100644 --- a/pkg/app/app_list_test.go +++ b/pkg/app/app_list_test.go @@ -317,12 +317,12 @@ releases: version: ">=1.0.0" `, "/path/to/helmfile.lock": `version: v0.0.0 +digest: sha256:abc123 +generated: "2024-01-01T00:00:00Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami version: 17.0.7 -digest: sha256:abc123 -generated: "2024-01-01T00:00:00Z" `, } @@ -381,12 +381,12 @@ releases: version: ">=1.0.0" `, "/path/to/helmfile.d/first.lock": `version: v0.0.0 +digest: sha256:abc123 +generated: "2024-01-01T00:00:00Z" dependencies: - name: redis repository: https://charts.bitnami.com/bitnami version: 17.0.7 -digest: sha256:abc123 -generated: "2024-01-01T00:00:00Z" `, "/path/to/helmfile.d/second.yaml": ` repositories: @@ -400,12 +400,12 @@ releases: version: ">=1.0.0" `, "/path/to/helmfile.d/second.lock": `version: v0.0.0 +digest: sha256:def456 +generated: "2024-01-01T00:00:00Z" dependencies: - name: nginx repository: https://charts.bitnami.com/bitnami version: 15.0.0 -digest: sha256:def456 -generated: "2024-01-01T00:00:00Z" `, } diff --git a/pkg/state/state_test.go b/pkg/state/state_test.go index 51976dea..3db91dd4 100644 --- a/pkg/state/state_test.go +++ b/pkg/state/state_test.go @@ -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.Join(basePath, "example/Chart.yaml"): `foo: FOO`, + "/example/Chart.yaml": `foo: FOO`, + filepath.ToSlash(filepath.Join(basePath, "example/Chart.yaml")): `foo: FOO`, }) - fs.Cwd = basePath + fs.Cwd = filepath.ToSlash(basePath) state = injectFs(state, fs) errs := state.UpdateDeps(helm, false)