Integration test tweaks

Author: r2d4

test/integration/cluster_logs_test.go

@@ -38,6 +38,15 @@ func testClusterLogs(t *testing.T) {
 	logWords := []string{"minikube", ".go"}
 	for _, logWord := range logWords {
 		if !strings.Contains(logsCmdOutput, logWord) {
+			debugCmds := []string{
+				"journalctl --verify",
+				"journalctl",
+				"systemctl status",
+				"systemctl status systemd-journald",
+			}
+			for _, cmd := range debugCmds {
+				t.Logf("Command: %s\nOutput: %s", cmd, minikubeRunner.RunCommand(cmd, false))
+			}
 			t.Fatalf("Error in logsCmdOutput, expected to find: %s. Output: %s", logWord, logsCmdOutput)
 		}
 	}

test/integration/cluster_status_test.go

@@ -52,7 +52,7 @@ func testClusterStatus(t *testing.T) {
 		return nil
 	}
 
-	if err := commonutil.RetryAfter(10, healthy, 1*time.Second); err != nil {
+	if err := commonutil.RetryAfter(30, healthy, 1*time.Second); err != nil {
 		t.Fatalf("Cluster is not healthy: %s", err)
 	}
 }

test/integration/persistence_test.go

@@ -57,7 +57,7 @@ func TestPersistence(t *testing.T) {
 		return &commonutil.RetriableError{Err: fmt.Errorf("Pod %s is not ready yet.", podName)}
 	}
 
-	if err := commonutil.RetryAfter(20, checkPod, 6*time.Second); err != nil {
+	if err := commonutil.RetryAfter(100, checkPod, 6*time.Second); err != nil {
 		t.Fatalf("Error checking the status of pod %s. Err: %s", podName, err)
 	}
 
@@ -98,7 +98,7 @@ func TestPersistence(t *testing.T) {
 	minikubeRunner.Start()
 	minikubeRunner.CheckStatus(state.Running.String())
 
-	if err := commonutil.RetryAfter(5, checkPod, 3*time.Second); err != nil {
+	if err := commonutil.RetryAfter(100, checkPod, 10*time.Second); err != nil {
 		t.Fatalf("Error checking the status of pod %s. Err: %s", podName, err)
 	}
 

test/integration/util/util.go

@@ -59,7 +59,7 @@ func (m *MinikubeRunner) RunCommand(command string, checkError bool) string {
 	commandArr := strings.Split(command, " ")
 	path, _ := filepath.Abs(m.BinaryPath)
 	cmd := exec.Command(path, commandArr...)
-	stdout, err := cmd.Output()
+	stdout, err := cmd.CombinedOutput()
 
 	if checkError && err != nil {
 		if exitError, ok := err.(*exec.ExitError); ok {