From fb1dd48b5a1994e8a81a9b734cb6503d024799cd Mon Sep 17 00:00:00 2001
From: Chance Zibolski <chance.zibolski@coreos.com>
Date: Wed, 11 Apr 2018 16:48:53 -0700
Subject: [PATCH] test helm template -x with non-existent manifest

---
 cmd/helm/template_test.go | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/cmd/helm/template_test.go b/cmd/helm/template_test.go
index 7505b0474..68ed87cd2 100644
--- a/cmd/helm/template_test.go
+++ b/cmd/helm/template_test.go
@@ -43,6 +43,7 @@ func TestTemplateCmd(t *testing.T) {
 		args        []string
 		expectKey   string
 		expectValue string
+		expectError string
 	}{
 		{
 			name:        "check_name",
@@ -65,6 +66,12 @@ func TestTemplateCmd(t *testing.T) {
 			expectKey:   "subchart1/templates/service.yaml",
 			expectValue: "protocol: TCP\n    name: apache",
 		},
+		{
+			name:        "check_execute_non_existent",
+			desc:        "verify --execute fails on a template that doesnt exist",
+			args:        []string{subchart1ChartPath, "-x", "templates/thisdoesntexist.yaml"},
+			expectError: "could not find template",
+		},
 		{
 			name:        "check_execute_absolute",
 			desc:        "verify --execute single template",
@@ -143,8 +150,21 @@ func TestTemplateCmd(t *testing.T) {
 			cmd := newTemplateCmd(out)
 			cmd.SetArgs(tt.args)
 			err := cmd.Execute()
-			if err != nil {
-				t.Errorf("expected: %v, got %v", tt.expectValue, err)
+
+			if tt.expectError != "" {
+				if err == nil {
+					t.Errorf("expected err: %s, but no error occurred", tt.expectError)
+				}
+				// non nil error, check if it contains the expected error
+				if strings.Contains(err.Error(), tt.expectError) {
+					// had the error we were looking for, this test case is
+					// done
+					return
+				} else {
+					t.Fatalf("expected err: %q, got: %q", tt.expectError, err)
+				}
+			} else if err != nil {
+				t.Errorf("expected no error, got %v", err)
 			}
 			// restore stdout
 			w.Close()