From b704947d54cbbe10c54e247f85fcfa5fb79d6065 Mon Sep 17 00:00:00 2001 From: Justin Scott Date: Mon, 26 Jun 2017 14:41:00 -0700 Subject: [PATCH] Fix broken tests due to "server-side" text change. --- cmd/helm/init_test.go | 2 +- cmd/helm/reset.go | 4 ++-- cmd/helm/reset_test.go | 6 +++--- docs/helm/helm_reset.md | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/helm/init_test.go b/cmd/helm/init_test.go index c871ef68b..45d8266f3 100644 --- a/cmd/helm/init_test.go +++ b/cmd/helm/init_test.go @@ -67,7 +67,7 @@ func TestInitCmd(t *testing.T) { if !actions[1].Matches("create", "services") { t.Errorf("unexpected action: %v, expected create service", actions[1]) } - expected := "Tiller (the helm server side component) has been installed into your Kubernetes Cluster." + expected := "Tiller (the helm server-side component) has been installed into your Kubernetes Cluster." if !strings.Contains(buf.String(), expected) { t.Errorf("expected %q, got %q", expected, buf.String()) } diff --git a/cmd/helm/reset.go b/cmd/helm/reset.go index e8d3f1068..95a9ca953 100644 --- a/cmd/helm/reset.go +++ b/cmd/helm/reset.go @@ -32,7 +32,7 @@ import ( ) const resetDesc = ` -This command uninstalls Tiller (the helm server side component) from your +This command uninstalls Tiller (the helm server-side component) from your Kubernetes Cluster and optionally deletes local configuration in $HELM_HOME (default ~/.helm/) ` @@ -114,7 +114,7 @@ func (d *resetCmd) run() error { } } - fmt.Fprintln(d.out, "Tiller (the helm server side component) has been uninstalled from your Kubernetes Cluster.") + fmt.Fprintln(d.out, "Tiller (the helm server-side component) has been uninstalled from your Kubernetes Cluster.") return nil } diff --git a/cmd/helm/reset_test.go b/cmd/helm/reset_test.go index 781f3f308..a0a325396 100644 --- a/cmd/helm/reset_test.go +++ b/cmd/helm/reset_test.go @@ -55,7 +55,7 @@ func TestResetCmd(t *testing.T) { if len(actions) != 2 { t.Errorf("Expected 2 actions, got %d", len(actions)) } - expected := "Tiller (the helm server side component) has been uninstalled from your Kubernetes Cluster." + expected := "Tiller (the helm server-side component) has been uninstalled from your Kubernetes Cluster." if !strings.Contains(buf.String(), expected) { t.Errorf("expected %q, got %q", expected, buf.String()) } @@ -89,7 +89,7 @@ func TestResetCmd_removeHelmHome(t *testing.T) { if len(actions) != 2 { t.Errorf("Expected 2 actions, got %d", len(actions)) } - expected := "Tiller (the helm server side component) has been uninstalled from your Kubernetes Cluster." + expected := "Tiller (the helm server-side component) has been uninstalled from your Kubernetes Cluster." if !strings.Contains(buf.String(), expected) { t.Errorf("expected %q, got %q", expected, buf.String()) } @@ -160,7 +160,7 @@ func TestReset_forceFlag(t *testing.T) { if len(actions) != 2 { t.Errorf("Expected 2 actions, got %d", len(actions)) } - expected := "Tiller (the helm server side component) has been uninstalled from your Kubernetes Cluster." + expected := "Tiller (the helm server-side component) has been uninstalled from your Kubernetes Cluster." if !strings.Contains(buf.String(), expected) { t.Errorf("expected %q, got %q", expected, buf.String()) } diff --git a/docs/helm/helm_reset.md b/docs/helm/helm_reset.md index bfd34d753..e3a9de9ed 100644 --- a/docs/helm/helm_reset.md +++ b/docs/helm/helm_reset.md @@ -6,7 +6,7 @@ uninstalls Tiller from a cluster -This command uninstalls Tiller (the helm server side component) from your +This command uninstalls Tiller (the helm server-side component) from your Kubernetes Cluster and optionally deletes local configuration in $HELM_HOME (default ~/.helm/) @@ -40,4 +40,4 @@ helm reset ### SEE ALSO * [helm](helm.md) - The Helm package manager for Kubernetes. -###### Auto generated by spf13/cobra on 23-Jun-2017 +###### Auto generated by spf13/cobra on 26-Jun-2017