From 9674792897e34e023649c2b68ff736a28a69d834 Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Wed, 7 Mar 2018 10:42:39 -0800
Subject: [PATCH] translate hack/e2e.go -v to --verbose-commands

---
 hack/e2e.go      |  4 +++-
 hack/e2e_test.go | 20 +++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/hack/e2e.go b/hack/e2e.go
index c016926c4a4..6352f42f65e 100644
--- a/hack/e2e.go
+++ b/hack/e2e.go
@@ -46,6 +46,7 @@ func parse(args []string) (flags, error) {
 	fs := flag.NewFlagSet(args[0], flag.ContinueOnError)
 	get := fs.Bool("get", getDefault, "go get -u kubetest if old or not installed")
 	old := fs.Duration("old", oldDefault, "Consider kubetest old if it exceeds this")
+	verbose := fs.Bool("v", true, "this flag is translated to kubetest's --verbose-commands")
 	var a []string
 	if err := fs.Parse(args[1:]); err == flag.ErrHelp {
 		os.Stderr.WriteString("  -- kubetestArgs\n")
@@ -58,7 +59,8 @@ func parse(args []string) (flags, error) {
 		log.Print("  The -- flag separator also suppresses this message")
 		a = args[len(args)-fs.NArg()-1:]
 	} else {
-		a = fs.Args()
+		a = append(a, fmt.Sprintf("--verbose-commands=%t", *verbose))
+		a = append(a, fs.Args()...)
 	}
 	return flags{*get, *old, a}, nil
 }
diff --git a/hack/e2e_test.go b/hack/e2e_test.go
index 77aca4ed52f..cbede240968 100644
--- a/hack/e2e_test.go
+++ b/hack/e2e_test.go
@@ -62,14 +62,24 @@ func TestParse(t *testing.T) {
 		expected flags
 		err      error
 	}{
+		{
+			[]string{"foo", "-v=false"},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=false"}},
+			nil,
+		},
+		{
+			[]string{"foo", "-v"},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true"}},
+			nil,
+		},
 		{
 			[]string{"hello", "world"},
-			flags{getDefault, oldDefault, []string{"world"}},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true", "world"}},
 			nil,
 		},
 		{
 			[]string{"hello", "--", "--venus", "--karaoke"},
-			flags{getDefault, oldDefault, []string{"--venus", "--karaoke"}},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true", "--venus", "--karaoke"}},
 			nil,
 		},
 		{
@@ -84,12 +94,12 @@ func TestParse(t *testing.T) {
 		},
 		{
 			[]string{"omg", "--get=false", "--", "ugh"},
-			flags{false, oldDefault, []string{"ugh"}},
+			flags{false, oldDefault, []string{"--verbose-commands=true", "ugh"}},
 			nil,
 		},
 		{
 			[]string{"wee", "--old=5m", "--get"},
-			flags{true, 5 * time.Minute, []string{}},
+			flags{true, 5 * time.Minute, []string{"--verbose-commands=true"}},
 			nil,
 		},
 		{
@@ -104,7 +114,7 @@ func TestParse(t *testing.T) {
 		},
 		{
 			[]string{"wut", "--", "-h"},
-			flags{getDefault, oldDefault, []string{"-h"}},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true", "-h"}},
 			nil,
 		},
 	}