From 9042b17f773ec049127cb89eb2253114807d3d09 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Sat, 16 Sep 2023 14:07:44 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- pkg/app/app_template_test.go | 2 -- pkg/app/testdata/app_diff_test/include-needs | 18 ++++++++---------- ...eds_should_not_fail_on_disabled_direct_need | 2 +- ...should_not_fail_on_disabled_transitive_need | 17 ++++++----------- .../app_diff_test/include-transitive-needs | 2 +- 5 files changed, 16 insertions(+), 25 deletions(-) diff --git a/pkg/app/app_template_test.go b/pkg/app/app_template_test.go index f2ca937b..b1105b8a 100644 --- a/pkg/app/app_template_test.go +++ b/pkg/app/app_template_test.go @@ -203,8 +203,6 @@ releases: error: ``, selectors: []string{"app=test"}, templated: []exectest.Release{ - // TODO: Turned out we can't differentiate needs vs transitive needs in this case :thinking: - {Name: "logging", Flags: []string{"--namespace", "kube-system"}}, {Name: "kubernetes-external-secrets", Flags: []string{"--namespace", "kube-system"}}, {Name: "external-secrets", Flags: []string{"--namespace", "default"}}, {Name: "my-release", Flags: []string{"--namespace", "default"}}, diff --git a/pkg/app/testdata/app_diff_test/include-needs b/pkg/app/testdata/app_diff_test/include-needs index 5a1f4462..0bcc895f 100644 --- a/pkg/app/testdata/app_diff_test/include-needs +++ b/pkg/app/testdata/app_diff_test/include-needs @@ -102,17 +102,15 @@ second-pass rendering result of "helmfile.yaml.part.0": 44: merged environment: &{default map[] map[]} -2 release(s) matching app=test found in helmfile.yaml +3 release(s) matching app=test found in helmfile.yaml -processing 4 groups of releases in this order: +processing 3 groups of releases in this order: GROUP RELEASES -1 default/kube-system/logging -2 default/kube-system/kubernetes-external-secrets -3 default/default/external-secrets -4 default/default/my-release +1 default/kube-system/kubernetes-external-secrets +2 default/default/external-secrets +3 default/default/my-release -processing releases in group 1/4: default/kube-system/logging -processing releases in group 2/4: default/kube-system/kubernetes-external-secrets -processing releases in group 3/4: default/default/external-secrets -processing releases in group 4/4: default/default/my-release +processing releases in group 1/3: default/kube-system/kubernetes-external-secrets +processing releases in group 2/3: default/default/external-secrets +processing releases in group 3/3: default/default/my-release changing working directory back to "/path/to" diff --git a/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need b/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need index 3b0dd1a0..0462bbee 100644 --- a/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need +++ b/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_direct_need @@ -102,7 +102,7 @@ second-pass rendering result of "helmfile.yaml.part.0": 44: merged environment: &{default map[] map[]} -1 release(s) matching name=test2 found in helmfile.yaml +2 release(s) matching name=test2 found in helmfile.yaml processing 2 groups of releases in this order: GROUP RELEASES diff --git a/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_transitive_need b/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_transitive_need index 66c9f0bd..745f2284 100644 --- a/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_transitive_need +++ b/pkg/app/testdata/app_diff_test/include-needs_should_not_fail_on_disabled_transitive_need @@ -102,18 +102,13 @@ second-pass rendering result of "helmfile.yaml.part.0": 44: merged environment: &{default map[] map[]} -1 release(s) matching name=test3 found in helmfile.yaml +2 release(s) matching name=test3 found in helmfile.yaml -processing 3 groups of releases in this order: +processing 2 groups of releases in this order: GROUP RELEASES -1 default/kube-system/disabled -2 default//test2 -3 default//test3 - -processing releases in group 1/3: default/kube-system/disabled -processing releases in group 2/3: default//test2 -processing releases in group 3/3: default//test3 -Affected releases are: - disabled (incubator/raw) DELETED +1 default//test2 +2 default//test3 +processing releases in group 1/2: default//test2 +processing releases in group 2/2: default//test3 changing working directory back to "/path/to" diff --git a/pkg/app/testdata/app_diff_test/include-transitive-needs b/pkg/app/testdata/app_diff_test/include-transitive-needs index 5a1f4462..1624372f 100644 --- a/pkg/app/testdata/app_diff_test/include-transitive-needs +++ b/pkg/app/testdata/app_diff_test/include-transitive-needs @@ -102,7 +102,7 @@ second-pass rendering result of "helmfile.yaml.part.0": 44: merged environment: &{default map[] map[]} -2 release(s) matching app=test found in helmfile.yaml +4 release(s) matching app=test found in helmfile.yaml processing 4 groups of releases in this order: GROUP RELEASES