From 4e78c7473075e2c0d78ed9c8a88289a74e30227e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Lambert?= Date: Mon, 31 Aug 2020 11:24:03 +0700 Subject: [PATCH] fix: test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aurélien Lambert --- .../loader/testdata/frobnitz_with_bom.tgz | Bin 3523 -> 3556 bytes .../frobnitz_with_bom/values/value.yaml | 1 + .../charts}/mariner/values/placeholder.yaml | 0 pkg/lint/lint_test.go | 8 ++++---- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 pkg/chart/loader/testdata/frobnitz_with_bom/values/value.yaml rename pkg/chartutil/testdata/{ => frobnitz/charts}/mariner/values/placeholder.yaml (100%) diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom.tgz b/pkg/chart/loader/testdata/frobnitz_with_bom.tgz index be0cd027db34d392a875cf8151642f9922016dbd..d24775b1b720ee5e84cbd890e2a8bf952c7792f9 100644 GIT binary patch literal 3556 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 literal 3523 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 diff --git a/pkg/chart/loader/testdata/frobnitz_with_bom/values/value.yaml b/pkg/chart/loader/testdata/frobnitz_with_bom/values/value.yaml new file mode 100644 index 000000000..6c32007ff --- /dev/null +++ b/pkg/chart/loader/testdata/frobnitz_with_bom/values/value.yaml @@ -0,0 +1 @@ +name: "{{ .Values.name }} Too" diff --git a/pkg/chartutil/testdata/mariner/values/placeholder.yaml b/pkg/chartutil/testdata/frobnitz/charts/mariner/values/placeholder.yaml similarity index 100% rename from pkg/chartutil/testdata/mariner/values/placeholder.yaml rename to pkg/chartutil/testdata/frobnitz/charts/mariner/values/placeholder.yaml diff --git a/pkg/lint/lint_test.go b/pkg/lint/lint_test.go index 29ed67026..ab4770bf2 100644 --- a/pkg/lint/lint_test.go +++ b/pkg/lint/lint_test.go @@ -42,7 +42,7 @@ func TestBadChart(t *testing.T) { t.Errorf("Number of errors %v", len(m)) t.Errorf("All didn't fail with expected errors, got %#v", m) } - // There should be one INFO, 2 WARNINGs and 2 ERROR messages, check for them + // There should be one INFO, 2 WARNINGs and one ERROR messages, check for them var i, w, e, e2, e3, e4, e5, e6 bool for _, msg := range m { if msg.Severity == support.InfoSev { @@ -74,13 +74,13 @@ func TestBadChart(t *testing.T) { if strings.Contains(msg.Err.Error(), "dependencies are not valid in the Chart file with apiVersion") { e5 = true } - // This comes from the dependency check, which loads dependency info from the Chart.yaml - if strings.Contains(msg.Err.Error(), "unable to load chart") { + + if strings.Contains(msg.Err.Error(), "chart.metadata.name is required") { e6 = true } } } - if !e || !e2 || !e3 || !e4 || !e5 || !w || !i || !e6 { + if !e || !e2 || !e3 || !e4 || !e5 || !e6 || !w || !i { t.Errorf("Didn't find all the expected errors, got %#v", m) } }