From 996ce10a0001b3291b5ac33aafdbec1afe84883e Mon Sep 17 00:00:00 2001 From: Janario Oliveira Date: Sat, 26 Sep 2020 18:09:30 +0200 Subject: [PATCH] Fixed test case Signed-off-by: Janario Oliveira --- .../testdata/output/upgrade-with-dependency-update.txt | 9 +++++++++ .../output/upgrade-with-install-dependency-update.txt | 9 +++++++++ .../output/upgrade-with-install-missing-dependencies.txt | 2 ++ cmd/helm/upgrade_test.go | 7 ++++--- 4 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 cmd/helm/testdata/output/upgrade-with-dependency-update.txt create mode 100644 cmd/helm/testdata/output/upgrade-with-install-dependency-update.txt create mode 100644 cmd/helm/testdata/output/upgrade-with-install-missing-dependencies.txt diff --git a/cmd/helm/testdata/output/upgrade-with-dependency-update.txt b/cmd/helm/testdata/output/upgrade-with-dependency-update.txt new file mode 100644 index 000000000..822e190fb --- /dev/null +++ b/cmd/helm/testdata/output/upgrade-with-dependency-update.txt @@ -0,0 +1,9 @@ +Release "updeps" has been upgraded. Happy Helming! +NAME: updeps +LAST DEPLOYED: Fri Sep 2 22:04:05 1977 +NAMESPACE: default +STATUS: deployed +REVISION: 2 +TEST SUITE: None +NOTES: +PARENT NOTES diff --git a/cmd/helm/testdata/output/upgrade-with-install-dependency-update.txt b/cmd/helm/testdata/output/upgrade-with-install-dependency-update.txt new file mode 100644 index 000000000..b0aa0ae62 --- /dev/null +++ b/cmd/helm/testdata/output/upgrade-with-install-dependency-update.txt @@ -0,0 +1,9 @@ +Release "updeps" does not exist. Installing it now. +NAME: updeps +LAST DEPLOYED: Fri Sep 2 22:04:05 1977 +NAMESPACE: default +STATUS: deployed +REVISION: 1 +TEST SUITE: None +NOTES: +PARENT NOTES diff --git a/cmd/helm/testdata/output/upgrade-with-install-missing-dependencies.txt b/cmd/helm/testdata/output/upgrade-with-install-missing-dependencies.txt new file mode 100644 index 000000000..c89a3166e --- /dev/null +++ b/cmd/helm/testdata/output/upgrade-with-install-missing-dependencies.txt @@ -0,0 +1,2 @@ +Release "nodeps" does not exist. Installing it now. +Error: found in Chart.yaml, but missing in charts/ directory: reqsubchart2 diff --git a/cmd/helm/upgrade_test.go b/cmd/helm/upgrade_test.go index 43d790df8..ea24d14be 100644 --- a/cmd/helm/upgrade_test.go +++ b/cmd/helm/upgrade_test.go @@ -127,13 +127,13 @@ func TestUpgradeCmd(t *testing.T) { }, { name: "install a release with missing dependencies", - cmd: fmt.Sprintf("upgrade bonkers-bunny -i '%s'", missingDepsPath), + cmd: "upgrade nodeps -i testdata/testcharts/chart-missing-deps", golden: "output/upgrade-with-install-missing-dependencies.txt", wantError: true, }, { name: "install a release with missing dependencies", - cmd: fmt.Sprintf("upgrade bonkers-bunny -i --dependency-update '%s'", missingDepsPath), + cmd: "upgrade updeps -i --dependency-update testdata/testcharts/chart-with-subchart-update", golden: "output/upgrade-with-install-dependency-update.txt", }, { @@ -150,8 +150,9 @@ func TestUpgradeCmd(t *testing.T) { }, { name: "upgrade a release with missing dependencies", - cmd: fmt.Sprintf("upgrade --dependency-update bonkers-bunny %s", missingDepsPath), + cmd: "upgrade updeps --dependency-update testdata/testcharts/chart-with-subchart-update", golden: "output/upgrade-with-dependency-update.txt", + rels: []*release.Release{relMock("updeps", 1, ch)}, }, { name: "upgrade a release with bad dependencies",