From 385942c4351bcf45f779abd190e68a9cefcee8ff Mon Sep 17 00:00:00 2001 From: yxxhero Date: Sat, 16 Sep 2023 17:21:22 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- pkg/app/app_test.go | 16 +++---- .../log | 18 +++----- .../log | 18 +++----- pkg/app/testdata/testapply/install/log | 20 ++++---- pkg/app/testdata/testapply/noop/log | 8 ++-- pkg/app/testdata/testapply/smoke/log | 46 ++++++------------- 6 files changed, 47 insertions(+), 79 deletions(-) diff --git a/pkg/app/app_test.go b/pkg/app/app_test.go index 444195b9..325e2058 100644 --- a/pkg/app/app_test.go +++ b/pkg/app/app_test.go @@ -2887,13 +2887,13 @@ backend-v2 4 Fri Nov 1 08:40:07 2019 DEPLOYED backend-3.1.0 3.1.0 // Disable concurrency to avoid in-deterministic result concurrency: 1, upgraded: []exectest.Release{ + {Name: "database", Flags: []string{}}, + {Name: "frontend-v3", Flags: []string{}}, + {Name: "backend-v2", Flags: []string{}}, + {Name: "anotherbackend", Flags: []string{}}, + {Name: "servicemesh", Flags: []string{}}, {Name: "logging", Flags: []string{}}, {Name: "front-proxy", Flags: []string{}}, - {Name: "database", Flags: []string{}}, - {Name: "servicemesh", Flags: []string{}}, - {Name: "anotherbackend", Flags: []string{}}, - {Name: "backend-v2", Flags: []string{}}, - {Name: "frontend-v3", Flags: []string{}}, }, deleted: []exectest.Release{ {Name: "frontend-v1", Flags: []string{}}, @@ -2962,8 +2962,8 @@ releases: lists: map[exectest.ListKey]string{}, upgraded: []exectest.Release{ {Name: "baz", Flags: []string{}}, - {Name: "bar", Flags: []string{}}, {Name: "foo", Flags: []string{}}, + {Name: "bar", Flags: []string{}}, }, deleted: []exectest.Release{}, concurrency: 1, @@ -3009,8 +3009,8 @@ baz 4 Fri Nov 1 08:40:07 2019 DEPLOYED mychart3-3.1.0 3.1.0 defau }, upgraded: []exectest.Release{ {Name: "baz", Flags: []string{"--kube-context", "default"}}, - {Name: "bar", Flags: []string{"--kube-context", "default"}}, {Name: "foo", Flags: []string{"--kube-context", "default"}}, + {Name: "bar", Flags: []string{"--kube-context", "default"}}, }, deleted: []exectest.Release{}, concurrency: 1, @@ -3056,8 +3056,8 @@ baz 4 Fri Nov 1 08:40:07 2019 DEPLOYED mychart3-3.1.0 3.1.0 defau }, upgraded: []exectest.Release{ {Name: "baz", Flags: []string{"--kube-context", "default"}}, - {Name: "bar", Flags: []string{"--kube-context", "default"}}, {Name: "foo", Flags: []string{"--kube-context", "default"}}, + {Name: "bar", Flags: []string{"--kube-context", "default"}}, }, deleted: []exectest.Release{}, concurrency: 1, diff --git a/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log b/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log index 7701e86e..4ba12348 100644 --- a/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log +++ b/pkg/app/testdata/testapply/install-with-upgrade-with-skip-diff-on-install/log @@ -47,26 +47,22 @@ Affected releases are: baz (stable/mychart3) UPDATED foo (stable/mychart1) UPDATED -invoking preapply hooks for 2 groups of releases in this order: +invoking preapply hooks for 1 groups of releases in this order: GROUP RELEASES -1 default//foo -2 default//baz, default//bar +1 default//baz, default//foo, default//bar -invoking preapply hooks for releases in group 1/2: default//foo -invoking preapply hooks for releases in group 2/2: default//baz, default//bar -processing 2 groups of releases in this order: +invoking preapply hooks for releases in group 1/1: default//baz, default//foo, default//bar +processing 1 groups of releases in this order: GROUP RELEASES -1 default//baz, default//bar -2 default//foo +1 default//baz, default//foo, default//bar -processing releases in group 1/2: default//baz, default//bar -processing releases in group 2/2: default//foo +processing releases in group 1/1: default//baz, default//foo, default//bar getting deployed release version failed: Failed to get the version for: mychart1 UPDATED RELEASES: NAME CHART VERSION DURATION baz stable/mychart3 3.1.0 0s -bar stable/mychart2 3.1.0 0s foo stable/mychart1 0s +bar stable/mychart2 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log b/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log index 7701e86e..4ba12348 100644 --- a/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log +++ b/pkg/app/testdata/testapply/install-with-upgrade-with-validation-control/log @@ -47,26 +47,22 @@ Affected releases are: baz (stable/mychart3) UPDATED foo (stable/mychart1) UPDATED -invoking preapply hooks for 2 groups of releases in this order: +invoking preapply hooks for 1 groups of releases in this order: GROUP RELEASES -1 default//foo -2 default//baz, default//bar +1 default//baz, default//foo, default//bar -invoking preapply hooks for releases in group 1/2: default//foo -invoking preapply hooks for releases in group 2/2: default//baz, default//bar -processing 2 groups of releases in this order: +invoking preapply hooks for releases in group 1/1: default//baz, default//foo, default//bar +processing 1 groups of releases in this order: GROUP RELEASES -1 default//baz, default//bar -2 default//foo +1 default//baz, default//foo, default//bar -processing releases in group 1/2: default//baz, default//bar -processing releases in group 2/2: default//foo +processing releases in group 1/1: default//baz, default//foo, default//bar getting deployed release version failed: Failed to get the version for: mychart1 UPDATED RELEASES: NAME CHART VERSION DURATION baz stable/mychart3 3.1.0 0s -bar stable/mychart2 3.1.0 0s foo stable/mychart1 0s +bar stable/mychart2 3.1.0 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/install/log b/pkg/app/testdata/testapply/install/log index f5b2efc4..4401af61 100644 --- a/pkg/app/testdata/testapply/install/log +++ b/pkg/app/testdata/testapply/install/log @@ -41,28 +41,24 @@ Affected releases are: baz (stable/mychart3) UPDATED foo (stable/mychart1) UPDATED -invoking preapply hooks for 2 groups of releases in this order: +invoking preapply hooks for 1 groups of releases in this order: GROUP RELEASES -1 default//foo -2 default//baz, default//bar +1 default//baz, default//foo, default//bar -invoking preapply hooks for releases in group 1/2: default//foo -invoking preapply hooks for releases in group 2/2: default//baz, default//bar -processing 2 groups of releases in this order: +invoking preapply hooks for releases in group 1/1: default//baz, default//foo, default//bar +processing 1 groups of releases in this order: GROUP RELEASES -1 default//baz, default//bar -2 default//foo +1 default//baz, default//foo, default//bar -processing releases in group 1/2: default//baz, default//bar +processing releases in group 1/1: default//baz, default//foo, default//bar getting deployed release version failed: unexpected list key: listkey(filter=^baz$,flags=--kube-context default --uninstalling --deployed --failed --pending) not found in -getting deployed release version failed: unexpected list key: listkey(filter=^bar$,flags=--kube-context default --uninstalling --deployed --failed --pending) not found in -processing releases in group 2/2: default//foo getting deployed release version failed: unexpected list key: listkey(filter=^foo$,flags=--kube-context default --uninstalling --deployed --failed --pending) not found in +getting deployed release version failed: unexpected list key: listkey(filter=^bar$,flags=--kube-context default --uninstalling --deployed --failed --pending) not found in UPDATED RELEASES: NAME CHART VERSION DURATION baz stable/mychart3 0s -bar stable/mychart2 0s foo stable/mychart1 0s +bar stable/mychart2 0s changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/noop/log b/pkg/app/testdata/testapply/noop/log index 89669abf..ea2485b4 100644 --- a/pkg/app/testdata/testapply/noop/log +++ b/pkg/app/testdata/testapply/noop/log @@ -34,11 +34,9 @@ second-pass rendering result of "helmfile.yaml.part.0": merged environment: &{default map[] map[]} 2 release(s) found in helmfile.yaml -invoking preapply hooks for 2 groups of releases in this order: +invoking preapply hooks for 1 groups of releases in this order: GROUP RELEASES -1 default//foo -2 default//bar +1 default//bar, default//foo -invoking preapply hooks for releases in group 1/2: default//foo -invoking preapply hooks for releases in group 2/2: default//bar +invoking preapply hooks for releases in group 1/1: default//bar, default//foo changing working directory back to "/path/to" diff --git a/pkg/app/testdata/testapply/smoke/log b/pkg/app/testdata/testapply/smoke/log index 566fe147..19a35b65 100644 --- a/pkg/app/testdata/testapply/smoke/log +++ b/pkg/app/testdata/testapply/smoke/log @@ -135,49 +135,31 @@ Affected releases are: logging (charts/fluent-bit) UPDATED servicemesh (charts/istio) UPDATED -invoking preapply hooks for 5 groups of releases in this order: +invoking preapply hooks for 1 groups of releases in this order: GROUP RELEASES -1 default//frontend-v1, default//frontend-v2, default//frontend-v3 -2 default//backend-v1, default//backend-v2 -3 default//anotherbackend -4 default//database, default//servicemesh -5 default//logging, default//front-proxy +1 default//database, default//frontend-v1, default//frontend-v2, default//frontend-v3, default//backend-v1, default//backend-v2, default//anotherbackend, default//servicemesh, default//logging, default//front-proxy -invoking preapply hooks for releases in group 1/5: default//frontend-v1, default//frontend-v2, default//frontend-v3 -invoking preapply hooks for releases in group 2/5: default//backend-v1, default//backend-v2 -invoking preapply hooks for releases in group 3/5: default//anotherbackend -invoking preapply hooks for releases in group 4/5: default//database, default//servicemesh -invoking preapply hooks for releases in group 5/5: default//logging, default//front-proxy -processing 2 groups of releases in this order: +invoking preapply hooks for releases in group 1/1: default//database, default//frontend-v1, default//frontend-v2, default//frontend-v3, default//backend-v1, default//backend-v2, default//anotherbackend, default//servicemesh, default//logging, default//front-proxy +processing 1 groups of releases in this order: GROUP RELEASES -1 default//frontend-v1 -2 default//backend-v1 +1 default//frontend-v1, default//backend-v1 -processing releases in group 1/2: default//frontend-v1 -processing releases in group 2/2: default//backend-v1 -processing 5 groups of releases in this order: +processing releases in group 1/1: default//frontend-v1, default//backend-v1 +processing 1 groups of releases in this order: GROUP RELEASES -1 default//logging, default//front-proxy -2 default//database, default//servicemesh -3 default//anotherbackend -4 default//backend-v2 -5 default//frontend-v3 +1 default//database, default//frontend-v3, default//backend-v2, default//anotherbackend, default//servicemesh, default//logging, default//front-proxy -processing releases in group 1/5: default//logging, default//front-proxy -processing releases in group 2/5: default//database, default//servicemesh -processing releases in group 3/5: default//anotherbackend -processing releases in group 4/5: default//backend-v2 -processing releases in group 5/5: default//frontend-v3 +processing releases in group 1/1: default//database, default//frontend-v3, default//backend-v2, default//anotherbackend, default//servicemesh, default//logging, default//front-proxy UPDATED RELEASES: NAME CHART VERSION DURATION +database charts/mysql 3.1.0 0s +frontend-v3 charts/frontend 3.1.0 0s +backend-v2 charts/backend 3.1.0 0s +anotherbackend charts/anotherbackend 3.1.0 0s +servicemesh charts/istio 3.1.0 0s logging charts/fluent-bit 3.1.0 0s front-proxy stable/envoy 3.1.0 0s -database charts/mysql 3.1.0 0s -servicemesh charts/istio 3.1.0 0s -anotherbackend charts/anotherbackend 3.1.0 0s -backend-v2 charts/backend 3.1.0 0s -frontend-v3 charts/frontend 3.1.0 0s DELETED RELEASES: