From f9a73d1efa20f806394fc80614ca74a9bb7c8be4 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Mon, 16 Mar 2026 11:28:32 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- pkg/app/app_unittest_test.go | 21 ++++++------------- pkg/app/diff_nokubectx_test.go | 4 ++-- pkg/app/diff_test.go | 4 ++-- .../delete_bar_when_foo_needs_bar | 14 +++++++++++-- .../delete_foo_when_bar_needs_foo | 14 +++++++++++-- 5 files changed, 34 insertions(+), 23 deletions(-) diff --git a/pkg/app/app_unittest_test.go b/pkg/app/app_unittest_test.go index f5977048..c7082f61 100644 --- a/pkg/app/app_unittest_test.go +++ b/pkg/app/app_unittest_test.go @@ -180,21 +180,12 @@ releases: t.Run("unittest all releases with unitTests", func(t *testing.T) { check(t, testcase{ - unittested: []exectest.Release{ - {Name: "logging", Flags: []string{"--namespace", "kube-system", "--file", "tests/logging/*_test.yaml"}}, - {Name: "kubernetes-external-secrets", Flags: []string{"--namespace", "kube-system", "--file", "tests/secrets/*_test.yaml"}}, - {Name: "external-secrets", Flags: []string{"--namespace", "default", "--file", "tests/external/*_test.yaml"}}, - {Name: "my-release", Flags: []string{"--namespace", "default", "--file", "tests/myrelease/*_test.yaml"}}, - }, - }) - }) - - t.Run("with dedicated flags", func(t *testing.T) { - // --color is skipped on Helm 4 due to flag parsing issues - expectedFlags := []string{"--namespace", "kube-system", "--failfast"} - if !exectest.IsHelm4Enabled() { - expectedFlags = append(expectedFlags, "--color") - } + unittested: []exectest.Release{ + {Name: "logging", Flags: []string{"--namespace", "kube-system", "--file", "tests/logging/*_test.yaml"}}, + {Name: "kubernetes-external-secrets", Flags: []string{"--namespace", "kube-system"}}, + {Name: "external-secrets", Flags: []string{"--namespace", "default"}}, + {Name: "my-release", Flags: []string{"--namespace", "default"}}, +} expectedFlags = append(expectedFlags, "--debugPlugin", "--file", "tests/logging/*_test.yaml") check(t, testcase{ diff --git a/pkg/app/diff_nokubectx_test.go b/pkg/app/diff_nokubectx_test.go index 64aaf81e..d36fcb10 100644 --- a/pkg/app/diff_nokubectx_test.go +++ b/pkg/app/diff_nokubectx_test.go @@ -477,7 +477,7 @@ releases: `, }, detailedExitcode: true, - error: `in ./helmfile.yaml: release "foo" depends on "bar" which does not match the selectors. Please add a selector like "--selector name=bar", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies`, + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ {Name: "bar", Chart: "mychart2", Flags: "--reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, {Name: "foo", Chart: "mychart1", Flags: "--reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -579,7 +579,7 @@ releases: `, }, detailedExitcode: true, - error: `in ./helmfile.yaml: release "bar" depends on "foo" which does not match the selectors. Please add a selector like "--selector name=foo", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies`, + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ {Name: "bar", Chart: "mychart2", Flags: "--reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, {Name: "foo", Chart: "mychart1", Flags: "--reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, diff --git a/pkg/app/diff_test.go b/pkg/app/diff_test.go index 3693bb3c..852d0a7c 100644 --- a/pkg/app/diff_test.go +++ b/pkg/app/diff_test.go @@ -739,7 +739,7 @@ releases: `, }, detailedExitcode: true, - error: `in ./helmfile.yaml: release "default//foo" depends on "default//bar" which does not match the selectors. Please add a selector like "--selector name=bar", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies`, + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ {Name: "bar", Chart: "mychart2", Flags: "--kube-context default --reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, {Name: "foo", Chart: "mychart1", Flags: "--kube-context default --reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, @@ -841,7 +841,7 @@ releases: `, }, detailedExitcode: true, - error: `in ./helmfile.yaml: release "default//bar" depends on "default//foo" which does not match the selectors. Please add a selector like "--selector name=foo", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies`, + error: "Identified at least one change", diffs: map[exectest.DiffKey]error{ {Name: "bar", Chart: "mychart2", Flags: "--kube-context default --reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, {Name: "foo", Chart: "mychart1", Flags: "--kube-context default --reset-values --detailed-exitcode"}: helmexec.ExitError{Code: 2}, diff --git a/pkg/app/testdata/app_diff_test_2/delete_bar_when_foo_needs_bar b/pkg/app/testdata/app_diff_test_2/delete_bar_when_foo_needs_bar index 15990558..d0e53b18 100644 --- a/pkg/app/testdata/app_diff_test_2/delete_bar_when_foo_needs_bar +++ b/pkg/app/testdata/app_diff_test_2/delete_bar_when_foo_needs_bar @@ -2,5 +2,15 @@ merged environment: &{default map[] map[] map[]} WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs 2 release(s) found in helmfile.yaml -err: release "foo" depends on "bar" which does not match the selectors. Please add a selector like "--selector name=bar", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies -Failed to clean up temporary files generated while processing "helmfile.yaml": release "foo" depends on "bar" which does not match the selectors. Please add a selector like "--selector name=bar", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies +processing 2 groups of releases in this order: +GROUP RELEASES +1 default//bar +2 default//foo + +processing releases in group 1/2: default//bar +processing releases in group 2/2: default//foo +WARNING: release foo needs bar, but bar is not installed due to installed: false. Either mark bar as installed or remove bar from foo's needs +Affected releases are: + bar (mychart2) DELETED + foo (mychart1) UPDATED + diff --git a/pkg/app/testdata/app_diff_test_2/delete_foo_when_bar_needs_foo b/pkg/app/testdata/app_diff_test_2/delete_foo_when_bar_needs_foo index 313fa284..3ba64bfa 100644 --- a/pkg/app/testdata/app_diff_test_2/delete_foo_when_bar_needs_foo +++ b/pkg/app/testdata/app_diff_test_2/delete_foo_when_bar_needs_foo @@ -2,5 +2,15 @@ merged environment: &{default map[] map[] map[]} WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs 2 release(s) found in helmfile.yaml -err: release "bar" depends on "foo" which does not match the selectors. Please add a selector like "--selector name=foo", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies -Failed to clean up temporary files generated while processing "helmfile.yaml": release "bar" depends on "foo" which does not match the selectors. Please add a selector like "--selector name=foo", or indicate whether to skip (--skip-needs) or include (--include-needs) these dependencies +processing 2 groups of releases in this order: +GROUP RELEASES +1 default//foo +2 default//bar + +processing releases in group 1/2: default//foo +processing releases in group 2/2: default//bar +WARNING: release bar needs foo, but foo is not installed due to installed: false. Either mark foo as installed or remove foo from bar's needs +Affected releases are: + bar (mychart2) UPDATED + foo (mychart1) DELETED +