Merge pull request #173 from dlorenc/retry

This deflakes the cluster env test.

test/integration/addons_test.go

@@ -36,8 +36,7 @@ var (
 
 func TestAddons(t *testing.T) {
 	minikubeRunner := util.MinikubeRunner{BinaryPath: *binaryPath, T: t}
-	minikubeRunner.RunCommand("start", true)
-	minikubeRunner.CheckStatus("Running")
+	minikubeRunner.EnsureRunning()
 	kubectlRunner := util.NewKubectlRunner(t)
 
 	checkAddon := func() error {

test/integration/cluster_env_test.go

@@ -19,24 +19,31 @@ limitations under the License.
 package integration
 
 import (
-	"k8s.io/minikube/test/integration/util"
 	"os/exec"
 	"testing"
+	"time"
+
+	commonutil "k8s.io/minikube/pkg/util"
+	"k8s.io/minikube/test/integration/util"
 )
 
 func TestClusterEnv(t *testing.T) {
 	minikubeRunner := util.MinikubeRunner{BinaryPath: *binaryPath, T: t}
-	minikubeRunner.RunCommand("start", true)
-	minikubeRunner.CheckStatus("Running")
+	minikubeRunner.EnsureRunning()
 
 	dockerEnvVars := minikubeRunner.RunCommand("docker-env", true)
 	if err := minikubeRunner.SetEnvFromEnvCmdOutput(dockerEnvVars); err != nil {
 		t.Fatalf("Error: No environment variables were found in docker-env command output: ", dockerEnvVars)
 	}
 	path, err := exec.LookPath("docker")
-	cmd := exec.Command(path, "ps")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
+
+	var output []byte
+	dockerPs := func() error {
+		cmd := exec.Command(path, "ps")
+		output, err = cmd.CombinedOutput()
+		return err
+	}
+	if err := commonutil.RetryAfter(5, dockerPs, 3*time.Second); err != nil {
 		t.Fatalf("Error running command: %s. Error: %s Output: %s", "docker ps", err, output)
 	}
 }

test/integration/cluster_logs_test.go

@@ -27,8 +27,7 @@ import (
 
 func TestClusterLogs(t *testing.T) {
 	minikubeRunner := util.MinikubeRunner{BinaryPath: *binaryPath, T: t}
-	minikubeRunner.RunCommand("start", true)
-	minikubeRunner.CheckStatus("Running")
+	minikubeRunner.EnsureRunning()
 
 	logsCmdOutput := minikubeRunner.RunCommand("logs", true)
 	//check for # of lines or check for strings

test/integration/cluster_ssh_test.go

@@ -26,8 +26,7 @@ import (
 
 func TestClusterSSH(t *testing.T) {
 	minikubeRunner := util.MinikubeRunner{BinaryPath: *binaryPath, T: t}
-	minikubeRunner.RunCommand("start", true)
-	minikubeRunner.CheckStatus("Running")
+	minikubeRunner.EnsureRunning()
 
 	expectedStr := "hello"
 	sshCmdOutput := minikubeRunner.RunCommand("ssh echo "+expectedStr, true)

test/integration/cluster_status_test.go

@@ -30,8 +30,7 @@ import (
 
 func TestClusterStatus(t *testing.T) {
 	minikubeRunner := util.MinikubeRunner{BinaryPath: *binaryPath, T: t}
-	minikubeRunner.RunCommand("start", true)
-	minikubeRunner.CheckStatus("Running")
+	minikubeRunner.EnsureRunning()
 
 	kubectlRunner := util.NewKubectlRunner(t)
 	cs := api.ComponentStatusList{}