Convert liveness tests to native ginkgo syntax #4253

test/e2e/liveness.go

@@ -20,134 +20,137 @@ limitations under the License.
 package e2e
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	"github.com/golang/glog"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-func runLivenessTest(c *client.Client, podDescr *api.Pod) bool {
+func runLivenessTest(c *client.Client, podDescr *api.Pod) {
+	defer GinkgoRecover()
 	ns := "e2e-test-" + string(util.NewUUID())
-	glog.Infof("Creating pod %s in namespace %s", podDescr.Name, ns)
+
+	By(fmt.Sprintf("Creating pod %s in namespace %s", podDescr.Name, ns))
 	_, err := c.Pods(ns).Create(podDescr)
-	if err != nil {
+	Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("creating pod %s", podDescr.Name))
-		glog.Infof("Failed to create pod %s: %v", podDescr.Name, err)
+
-		return false
-	}
 	// At the end of the test, clean up by removing the pod.
-	defer c.Pods(ns).Delete(podDescr.Name)
+	defer func() {
+		By("deleting the pod")
+		defer GinkgoRecover()
+		c.Pods(ns).Delete(podDescr.Name)
+	}()
+
 	// Wait until the pod is not pending. (Here we need to check for something other than
 	// 'Pending' other than checking for 'Running', since when failures occur, we go to
 	// 'Terminated' which can cause indefinite blocking.)
+	By("waiting for the pod to be something other than pending")
 	err = waitForPodNotPending(c, ns, podDescr.Name, 60*time.Second)
-	if err != nil {
+	Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("starting pod %s in namespace %s", podDescr.Name, ns))
-		glog.Infof("Failed to start pod %s in namespace %s: %v", podDescr.Name, ns, err)
+	fmt.Printf("Started pod %s in namespace %s\n", podDescr.Name, ns)
-		return false
-	}
-	glog.Infof("Started pod %s in namespace %s", podDescr.Name, ns)
 
 	// Check the pod's current state and verify that restartCount is present.
+	By("checking the pod's current state and verifying that restartCount is present")
 	pod, err := c.Pods(ns).Get(podDescr.Name)
-	if err != nil {
+	Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("getting pod %s in namespace %s", podDescr.Name, ns))
-		glog.Errorf("Get pod %s in namespace %s failed: %v", podDescr.Name, ns, err)
-		return false
-	}
 	initialRestartCount := pod.Status.Info["liveness"].RestartCount
-	glog.Infof("Initial restart count of pod %s is %d", podDescr.Name, initialRestartCount)
+	fmt.Printf("Initial restart count of pod %s is %d\n", podDescr.Name, initialRestartCount)
 
 	// Wait for at most 48 * 5 = 240s = 4 minutes until restartCount is incremented
+	pass := false
 	for i := 0; i < 48; i++ {
 		// Wait until restartCount is incremented.
 		time.Sleep(5 * time.Second)
 		pod, err = c.Pods(ns).Get(podDescr.Name)
-		if err != nil {
+		Expect(err).NotTo(HaveOccurred(), fmt.Sprintf("getting pod %s", podDescr.Name))
-			glog.Errorf("Get pod %s failed: %v", podDescr.Name, err)
-			return false
-		}
 		restartCount := pod.Status.Info["liveness"].RestartCount
-		glog.Infof("Restart count of pod %s in namespace %s is now %d", podDescr.Name, ns, restartCount)
+		fmt.Printf("Restart count of pod %s in namespace %s is now %d\n", podDescr.Name, ns, restartCount)
 		if restartCount > initialRestartCount {
-			glog.Infof("Restart count of pod %s in namespace %s increased from %d to %d during the test", podDescr.Name, ns, initialRestartCount, restartCount)
+			fmt.Printf("Restart count of pod %s in namespace %s increased from %d to %d during the test\n", podDescr.Name, ns, initialRestartCount, restartCount)
-			return true
+			pass = true
+			break
 		}
 	}
 
-	glog.Errorf("Did not see the restart count of pod %s in namespace %s increase from %d during the test", podDescr.Name, ns, initialRestartCount)
+	if !pass {
-	return false
+		Fail(fmt.Sprintf("Did not see the restart count of pod %s in namespace %s increase from %d during the test", podDescr.Name, ns, initialRestartCount))
-}
+	}
-
-// TestLivenessHttp tests restarts with a /healthz http liveness probe.
-func TestLivenessHttp(c *client.Client) bool {
-	return runLivenessTest(c, &api.Pod{
-		ObjectMeta: api.ObjectMeta{
-			Name:   "liveness-http",
-			Labels: map[string]string{"test": "liveness"},
-		},
-		Spec: api.PodSpec{
-			Containers: []api.Container{
-				{
-					Name:    "liveness",
-					Image:   "kubernetes/liveness",
-					Command: []string{"/server"},
-					LivenessProbe: &api.Probe{
-						Handler: api.Handler{
-							HTTPGet: &api.HTTPGetAction{
-								Path: "/healthz",
-								Port: util.NewIntOrStringFromInt(8080),
-							},
-						},
-						InitialDelaySeconds: 15,
-					},
-				},
-			},
-		},
-	})
-}
-
-// TestLivenessExec tests restarts with a docker exec "cat /tmp/health" liveness probe.
-func TestLivenessExec(c *client.Client) bool {
-	return runLivenessTest(c, &api.Pod{
-		ObjectMeta: api.ObjectMeta{
-			Name:   "liveness-exec",
-			Labels: map[string]string{"test": "liveness"},
-		},
-		Spec: api.PodSpec{
-			Containers: []api.Container{
-				{
-					Name:    "liveness",
-					Image:   "busybox",
-					Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; echo fail >/tmp/health; sleep 600"},
-					LivenessProbe: &api.Probe{
-						Handler: api.Handler{
-							Exec: &api.ExecAction{
-								Command: []string{"cat", "/tmp/health"},
-							},
-						},
-						InitialDelaySeconds: 15,
-					},
-				},
-			},
-		},
-	})
 }
 
 var _ = Describe("TestLivenessHttp", func() {
-	It("should pass", func() {
+	var c *client.Client
-		c, err := loadClient()
+
+	BeforeEach(func() {
+		var err error
+		c, err = loadClient()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(TestLivenessHttp(c)).To(BeTrue())
+	})
+
+	It("should restart pods with a /healthz http liveness probe", func() {
+		runLivenessTest(c, &api.Pod{
+			ObjectMeta: api.ObjectMeta{
+				Name:   "liveness-http",
+				Labels: map[string]string{"test": "liveness"},
+			},
+			Spec: api.PodSpec{
+				Containers: []api.Container{
+					{
+						Name:    "liveness",
+						Image:   "kubernetes/liveness",
+						Command: []string{"/server"},
+						LivenessProbe: &api.Probe{
+							Handler: api.Handler{
+								HTTPGet: &api.HTTPGetAction{
+									Path: "/healthz",
+									Port: util.NewIntOrStringFromInt(8080),
+								},
+							},
+							InitialDelaySeconds: 15,
+						},
+					},
+				},
+			},
+		})
 	})
 })
 
 var _ = Describe("TestLivenessExec", func() {
-	It("should pass", func() {
+	var c *client.Client
-		c, err := loadClient()
+
+	BeforeEach(func() {
+		var err error
+		c, err = loadClient()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(TestLivenessExec(c)).To(BeTrue())
+	})
+
+	It("should restart pods with a docker exec \"cat /tmp/health\"", func() {
+		runLivenessTest(c, &api.Pod{
+			ObjectMeta: api.ObjectMeta{
+				Name:   "liveness-exec",
+				Labels: map[string]string{"test": "liveness"},
+			},
+			Spec: api.PodSpec{
+				Containers: []api.Container{
+					{
+						Name:    "liveness",
+						Image:   "busybox",
+						Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; echo fail >/tmp/health; sleep 600"},
+						LivenessProbe: &api.Probe{
+							Handler: api.Handler{
+								Exec: &api.ExecAction{
+									Command: []string{"cat", "/tmp/health"},
+								},
+							},
+							InitialDelaySeconds: 15,
+						},
+					},
+				},
+			},
+		})
 	})
 })