Running functional pipeline

Author: bjee19

tests/suite/graceful_recovery_test.go

@@ -123,11 +123,7 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names
 		close(portForwardStopCh)
 	}
 
-	// drain node
-
 	if drain {
-
-		fmt.Printf("about to drain + %s", time.Now())
 		_, err := exec.Command(
 			"kubectl",
 			"drain",
@@ -139,10 +135,6 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names
 			Expect(err).ToNot(HaveOccurred())
 		}
 
-		fmt.Printf("just drained + %s", time.Now())
-
-		// delete node
-
 		_, err = exec.Command(
 			"kubectl",
 			"delete",
@@ -152,10 +144,7 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names
 		if err != nil {
 			Expect(err).ToNot(HaveOccurred())
 		}
-
-		fmt.Printf("just deleted! + %s", time.Now())
 	}
-	// restart docker container
 
 	output, err := exec.Command(
 		"docker",
@@ -169,7 +158,6 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names
 	fmt.Println(string(output))
 
 	var containerName string
-
 	for _, line := range strings.Split(string(output), "\n") {
 		for _, word := range strings.Split(line, " ") {
 			if strings.Contains(word, "control-plane") {
@@ -179,21 +167,11 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names
 		}
 	}
 
+	Expect(containerName).ToNot(Equal(""))
+
 	// really jank - get the string that contains "control-plane"
 	fmt.Println("This is our container name: " + containerName)
 
-	output, err = exec.Command(
-		"docker",
-		"container",
-		"inspect",
-		containerName,
-	).CombinedOutput()
-	if err != nil {
-		fmt.Println(fmt.Sprint(err.Error()))
-		Expect(err).ToNot(HaveOccurred())
-	}
-	fmt.Println(string(output))
-
 	_, err = exec.Command(
 		"docker",
 		"restart",
@@ -203,26 +181,37 @@ func runRestartNodeTest(teaURL, coffeeURL string, files []string, ns *core.Names
 		fmt.Println(fmt.Sprint(err.Error()))
 		Expect(err).ToNot(HaveOccurred())
 	}
-	fmt.Printf("just restarted! + %s", time.Now())
 
-	time.Sleep(time.Second * 10)
+	Eventually(
+		func() bool {
+			output, err = exec.Command(
+				"docker",
+				"container",
+				"inspect",
+				containerName,
+			).CombinedOutput()
+			return strings.Contains(string(output), "\"Running\": true") && err == nil
+		}).
+		WithTimeout(timeoutConfig.CreateTimeout).
+		WithPolling(500 * time.Millisecond).
+		Should(BeTrue())
 
+	var podNames []string
 	Eventually(
 		func() bool {
-			podNames, err := framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.GetTimeout)
+			podNames, err = framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.GetStatusTimeout)
 			return len(podNames) == 1 && err == nil
 		}).
 		WithTimeout(timeoutConfig.CreateTimeout).
 		WithPolling(500 * time.Millisecond).
 		Should(BeTrue())
-
-	podNames, _ := framework.GetReadyNGFPodNames(k8sClient, ngfNamespace, releaseName, timeoutConfig.CreateTimeout)
 	ngfPodName := podNames[0]
+	Expect(ngfPodName).ToNot(Equal(""))
 
 	if portFwdPort != 0 {
 		ports := []string{fmt.Sprintf("%d:80", ngfHTTPForwardedPort), fmt.Sprintf("%d:443", ngfHTTPSForwardedPort)}
 		portForwardStopCh = make(chan struct{})
-		err = framework.PortForward(ctlr.GetConfigOrDie(), ngfNamespace, podNames[0], ports, portForwardStopCh)
+		err = framework.PortForward(ctlr.GetConfigOrDie(), ngfNamespace, ngfPodName, ports, portForwardStopCh)
 		address = "127.0.0.1"
 		portFwdPort = ngfHTTPForwardedPort
 		portFwdHTTPSPort = ngfHTTPSForwardedPort