From 09cdf602b8dd19c0039c5a90b8bfcbb7d179d236 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 31 Aug 2020 11:21:23 -0700 Subject: [PATCH] Update TestFunctional/parallel/DryRun and TestJSONOutputError to match new behavior --- pkg/minikube/exit/exit.go | 13 ++++++++++--- test/integration/functional_test.go | 3 ++- test/integration/json_output_test.go | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkg/minikube/exit/exit.go b/pkg/minikube/exit/exit.go index 17783240ac..389d62220d 100644 --- a/pkg/minikube/exit/exit.go +++ b/pkg/minikube/exit/exit.go @@ -44,9 +44,16 @@ func Message(r reason.Kind, format string, args ...out.V) { if len(args) == 0 { args = append(args, out.V{}) } - args[0]["fatal_msg"] = out.Fmt(format, args...) - args[0]["fatal_code"] = r.ID - out.Error(r, "Exiting due to {{.fatal_code}}: {{.fatal_msg}}", args...) + + // No need to manipulate the message for JSON output + if out.JSON { + out.Error(r, format, args...) + } else { + args[0]["fatal_msg"] = out.Fmt(format, args...) + args[0]["fatal_code"] = r.ID + out.Error(r, "Exiting due to {{.fatal_code}}: {{.fatal_msg}}", args...) + } + os.Exit(r.ExitCode) } diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go index 4c4c88b7d4..addc549ee8 100644 --- a/test/integration/functional_test.go +++ b/test/integration/functional_test.go @@ -40,6 +40,7 @@ import ( "k8s.io/minikube/pkg/minikube/config" "k8s.io/minikube/pkg/minikube/localpath" + "k8s.io/minikube/pkg/minikube/reason" "k8s.io/minikube/pkg/util/retry" "github.com/elazarl/goproxy" @@ -450,7 +451,7 @@ func validateDryRun(ctx context.Context, t *testing.T, profile string) { c := exec.CommandContext(mctx, Target(), startArgs...) rr, err := Run(t, c) - wantCode := 78 // exit.Config + wantCode := reason.ExInsufficientMemory if rr.ExitCode != wantCode { t.Errorf("dry-run(250MB) exit code = %d, wanted = %d: %v", rr.ExitCode, wantCode, err) } diff --git a/test/integration/json_output_test.go b/test/integration/json_output_test.go index 90c6efafd3..b5085dffd7 100644 --- a/test/integration/json_output_test.go +++ b/test/integration/json_output_test.go @@ -123,7 +123,7 @@ func TestJSONOutputError(t *testing.T) { t.Fatalf("last cloud event is not of type error: %v", last) } last.validateData(t, "exitcode", fmt.Sprintf("%v", reason.ExDriverUnsupported)) - last.validateData(t, "message", fmt.Sprintf("The driver 'fail' is not supported on %s\n", runtime.GOOS)) + last.validateData(t, "message", fmt.Sprintf("The driver 'fail' is not supported on %s", runtime.GOOS)) } type cloudEvent struct { @@ -149,7 +149,7 @@ func (c *cloudEvent) validateData(t *testing.T, key, value string) { t.Fatalf("expected key %s does not exist in cloud event", key) } if v != value { - t.Fatalf("values in cloud events do not match:\nActual:\n%v\nExpected:\n%v\n", v, value) + t.Fatalf("values in cloud events do not match:\nActual:\n'%v'\nExpected:\n'%v'\n", v, value) } }