From a6f4bc1bc0fc721aa501f7b8667928b2ec4f0016 Mon Sep 17 00:00:00 2001
From: Jacob LeGrone <git@jacob.work>
Date: Thu, 5 Sep 2019 13:23:20 -0400
Subject: [PATCH] Remove "run" test subcommand

Signed-off-by: Jacob LeGrone <git@jacob.work>
---
 cmd/helm/release_testing.go     | 26 ++++++++++------
 cmd/helm/release_testing_run.go | 53 ---------------------------------
 cmd/helm/root.go                |  2 +-
 3 files changed, 18 insertions(+), 63 deletions(-)
 delete mode 100644 cmd/helm/release_testing_run.go

diff --git a/cmd/helm/release_testing.go b/cmd/helm/release_testing.go
index 0c5631abd..68f3d0248 100644
--- a/cmd/helm/release_testing.go
+++ b/cmd/helm/release_testing.go
@@ -18,28 +18,36 @@ package main
 
 import (
 	"io"
+	"time"
 
 	"github.com/spf13/cobra"
 
+	"helm.sh/helm/v3/cmd/helm/require"
 	"helm.sh/helm/v3/pkg/action"
 )
 
 const releaseTestHelp = `
-The test command consists of multiple subcommands around running tests on a release.
-
-Example usage:
-    $ helm test run [RELEASE]
+The test command runs the tests for a release.
 
+The argument this command takes is the name of a deployed release.
+The tests to be run are defined in the chart that was installed.
 `
 
 func newReleaseTestCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
+	client := action.NewReleaseTesting(cfg)
+
 	cmd := &cobra.Command{
-		Use:   "test",
-		Short: "test a release or cleanup test artifacts",
+		Use:   "test [RELEASE]",
+		Short: "run tests for a release",
 		Long:  releaseTestHelp,
+		Args:  require.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return client.Run(args[0])
+		},
 	}
-	cmd.AddCommand(
-		newReleaseTestRunCmd(cfg, out),
-	)
+
+	f := cmd.Flags()
+	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
+
 	return cmd
 }
diff --git a/cmd/helm/release_testing_run.go b/cmd/helm/release_testing_run.go
deleted file mode 100644
index 6dc769e83..000000000
--- a/cmd/helm/release_testing_run.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright The Helm Authors.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"io"
-	"time"
-
-	"github.com/spf13/cobra"
-
-	"helm.sh/helm/v3/cmd/helm/require"
-	"helm.sh/helm/v3/pkg/action"
-)
-
-const releaseTestRunHelp = `
-The test command runs the tests for a release.
-
-The argument this command takes is the name of a deployed release.
-The tests to be run are defined in the chart that was installed.
-`
-
-func newReleaseTestRunCmd(cfg *action.Configuration, out io.Writer) *cobra.Command {
-	client := action.NewReleaseTesting(cfg)
-
-	cmd := &cobra.Command{
-		Use:   "run [RELEASE]",
-		Short: "run tests for a release",
-		Long:  releaseTestRunHelp,
-		Args:  require.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return client.Run(args[0])
-		},
-	}
-
-	f := cmd.Flags()
-	f.DurationVar(&client.Timeout, "timeout", 300*time.Second, "time to wait for any individual Kubernetes operation (like Jobs for hooks)")
-	f.BoolVar(&client.Cleanup, "cleanup", false, "delete test pods upon completion")
-
-	return cmd
-}
diff --git a/cmd/helm/root.go b/cmd/helm/root.go
index e28e8bdfb..678409a52 100644
--- a/cmd/helm/root.go
+++ b/cmd/helm/root.go
@@ -139,7 +139,7 @@ __helm_custom_func()
 {
 	__helm_debug "${FUNCNAME[0]}: last_command is $last_command"
     case ${last_command} in
-		helm_uninstall | helm_history | helm_status | helm_test_run |\
+		helm_uninstall | helm_history | helm_status | helm_test |\
 	    helm_upgrade | helm_rollback | helm_get_*)
             __helm_list_releases
             return