add test for docker-env status check and fix feedbacks

Signed-off-by: Tharun <[email protected]>
kubernetes · Mar 23, 2021 · d72eea6 · d72eea6
1 parent 2779ec0
commit d72eea6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/cmd/minikube/cmd/docker-env.go b/cmd/minikube/cmd/docker-env.go
@@ -252,8 +252,7 @@ var dockerEnvCmd = &cobra.Command{
 		sh := shell.EnvConfig{
 			Shell: shl,
 		}
-		cname := ClusterFlagValue()
-		co := mustload.Running(cname)
+
 		if dockerUnset {
 			if err := dockerUnsetScript(DockerEnvConfig{EnvConfig: sh}, os.Stdout); err != nil {
 				exit.Error(reason.InternalEnvScript, "Error generating unset output", err)
@@ -266,6 +265,9 @@ var dockerEnvCmd = &cobra.Command{
 			exit.SetShell(true)
 		}
 
+		cname := ClusterFlagValue()
+		co := mustload.Running(cname)
+
 		driverName := co.CP.Host.DriverName
 
 		if driverName == driver.None {

diff --git a/go.sum b/go.sum
@@ -740,6 +740,7 @@ github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52/go.mod h1
 github.com/otiai10/copy v1.5.0 h1:SoXDGnlTUZoqB/wSuj/Y5L6T5i6iN4YRAcMCd+JnLNU=
 github.com/otiai10/copy v1.5.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
+github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI=
 github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
 github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E=

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
@@ -271,6 +271,9 @@ func validateDockerEnv(ctx context.Context, t *testing.T, profile string) {
 	if !strings.Contains(rr.Output(), "Running") {
 		t.Fatalf("expected status output to include 'Running' after eval docker-env but got: *%s*", rr.Output())
 	}
+	if !strings.Contains(rr.Output(), "in-use") {
+		t.Fatalf("expected status output to include `in-use` after eval docker-env but got *%s*", rr.Output())
+	}
 
 	mctx, cancel = context.WithTimeout(ctx, Seconds(60))
 	defer cancel()