github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-20 01:01:22 +00:00
Code Issues Projects Releases Wiki Activity

translate hack/e2e.go -v to --verbose-commands

Browse Source
This commit is contained in:
Benjamin Elder 2018-03-07 10:42:39 -08:00
parent 07c04c2a17
commit 9674792897
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e.go
View File

@ -46,6 +46,7 @@ func parse(args []string) (flags, error) {
fs := flag.NewFlagSet(args[0], flag.ContinueOnError) fs := flag.NewFlagSet(args[0], flag.ContinueOnError)
get := fs.Bool("get", getDefault, "go get -u kubetest if old or not installed") 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") 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 var a []string
if err := fs.Parse(args[1:]); err == flag.ErrHelp { if err := fs.Parse(args[1:]); err == flag.ErrHelp {
os.Stderr.WriteString(" -- kubetestArgs\n") os.Stderr.WriteString(" -- kubetestArgs\n")
@ -58,7 +59,8 @@ func parse(args []string) (flags, error) {
log.Print(" The -- flag separator also suppresses this message") log.Print(" The -- flag separator also suppresses this message")
a = args[len(args)-fs.NArg()-1:] a = args[len(args)-fs.NArg()-1:]
} else { } else {
a = fs.Args() a = append(a, fmt.Sprintf("--verbose-commands=%t", *verbose))
a = append(a, fs.Args()...)
} }
return flags{*get, *old, a}, nil return flags{*get, *old, a}, nil
} }

20
hack/e2e_test.go
View File

@ -62,14 +62,24 @@ func TestParse(t *testing.T) {
expected flags expected flags
err error 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"}, []string{"hello", "world"},
flags{getDefault, oldDefault, []string{"world"}}, flags{getDefault, oldDefault, []string{"--verbose-commands=true", "world"}},
nil, nil,
}, },
{ {
[]string{"hello", "--", "--venus", "--karaoke"}, []string{"hello", "--", "--venus", "--karaoke"},
flags{getDefault, oldDefault, []string{"--venus", "--karaoke"}}, flags{getDefault, oldDefault, []string{"--verbose-commands=true", "--venus", "--karaoke"}},
nil, nil,
}, },
{ {
@ -84,12 +94,12 @@ func TestParse(t *testing.T) {
}, },
{ {
[]string{"omg", "--get=false", "--", "ugh"}, []string{"omg", "--get=false", "--", "ugh"},
flags{false, oldDefault, []string{"ugh"}}, flags{false, oldDefault, []string{"--verbose-commands=true", "ugh"}},
nil, nil,
}, },
{ {
[]string{"wee", "--old=5m", "--get"}, []string{"wee", "--old=5m", "--get"},
flags{true, 5 * time.Minute, []string{}}, flags{true, 5 * time.Minute, []string{"--verbose-commands=true"}},
nil, nil,
}, },
{ {
@ -104,7 +114,7 @@ func TestParse(t *testing.T) {
}, },
{ {
[]string{"wut", "--", "-h"}, []string{"wut", "--", "-h"},
flags{getDefault, oldDefault, []string{"-h"}}, flags{getDefault, oldDefault, []string{"--verbose-commands=true", "-h"}},
nil, nil,
}, },
} }