From 4469f8bea57a33c301bc034255637f021e3e1b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Lambert?= Date: Tue, 24 Mar 2020 09:36:51 +0700 Subject: [PATCH] fix: tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Lambert --- pkg/chartutil/dependencies_test.go | 9 +++++++-- pkg/engine/engine_test.go | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/chartutil/dependencies_test.go b/pkg/chartutil/dependencies_test.go index 469d8c46e..41fa1b98a 100644 --- a/pkg/chartutil/dependencies_test.go +++ b/pkg/chartutil/dependencies_test.go @@ -277,7 +277,12 @@ func TestProcessDependencyImportValuesForEnabledCharts(t *testing.T) { c := loadChart(t, "testdata/import-values-from-enabled-subchart/parent-chart") nameOverride := "parent-chart-prod" - if err := processDependencyImportValues(c); err != nil { + cvals, err := CoalesceValues(c, nil) + if err != nil { + t.Fatalf("coalescing values %v", err) + } + + if err := ProcessDependencyImportValues(c, cvals); err != nil { t.Fatalf("processing import values dependencies %v", err) } @@ -285,7 +290,7 @@ func TestProcessDependencyImportValuesForEnabledCharts(t *testing.T) { t.Fatalf("expected 2 dependencies for this chart, but got %d", len(c.Dependencies())) } - if err := processDependencyEnabled(c, c.Values, ""); err != nil { + if err := recProcessDependencyEnabled(c, c.Values, nil); err != nil { t.Fatalf("expected no errors but got %q", err) } diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go index 944aaaf90..4e76d2e22 100644 --- a/pkg/engine/engine_test.go +++ b/pkg/engine/engine_test.go @@ -1020,8 +1020,8 @@ func TestUpdateRenderValues_dependencies(t *testing.T) { for i := range names { if names[i] != except[i] { t.Errorf("dependencies values do not match got %v, expected %v", names, except) + break } - break } } }