Converted TestClusterDNS to native ginkgo syntax #4162

test/e2e/service.go

@@ -23,19 +23,22 @@ import (
 	"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"
 )
 
-// TestClusterDNS checks that cluster DNS works.
-func TestClusterDNS(c *client.Client) bool {
-	if testContext.provider == "vagrant" {
-		glog.Infof("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
-		return true
-	}
+var _ = Describe("Services", func() {
+	var c *client.Client
+
+	BeforeEach(func() {
+		c = loadClientOrDie()
+	})
 
+	It("should provide DNS for the cluster", func() {
+		if testContext.provider == "vagrant" {
+			By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
+		} else {
 			podClient := c.Pods(api.NamespaceDefault)
 
 			//TODO: Wait for skyDNS
@@ -55,6 +58,7 @@ func TestClusterDNS(c *client.Client) bool {
 			probeCmd += "sleep 1; done"
 
 			// Run a pod which probes DNS and exposes the results by HTTP.
+			By("creating a pod to probe DNS")
 			pod := &api.Pod{
 				TypeMeta: api.TypeMeta{
 					Kind:       "Pod",
@@ -97,21 +101,30 @@ func TestClusterDNS(c *client.Client) bool {
 					},
 				},
 			}
+
+			By("submitting the pod to kuberenetes")
 			_, err := podClient.Create(pod)
 			if err != nil {
-		glog.Errorf("Failed to create %s pod: %v", pod.Name, err)
-		return false
+				Fail(fmt.Sprintf("Failed to create %s pod: %v", pod.Name, err))
 			}
-	defer podClient.Delete(pod.Name)
+			defer func() {
+				By("deleting the pod")
+				defer GinkgoRecover()
+				podClient.Delete(pod.Name)
+			}()
 
+
+			By("waiting for the pod to start running")
 			waitForPodRunning(c, pod.Name)
+
+			By("retrieving the pod")
 			pod, err = podClient.Get(pod.Name)
 			if err != nil {
-		glog.Errorf("Failed to get pod %s: %v", pod.Name, err)
-		return false
+				Fail(fmt.Sprintf("Failed to get pod %s: %v", pod.Name, err))
 			}
 
 			// Try to find results for each expected name.
+			By("looking for the results for each expected name")
 			var failed []string
 			for try := 1; try < 100; try++ {
 				failed = []string{}
@@ -125,30 +138,20 @@ func TestClusterDNS(c *client.Client) bool {
 						Do().Raw()
 					if err != nil {
 						failed = append(failed, name)
-				glog.V(4).Infof("Lookup using %s for %s failed: %v", pod.Name, name, err)
+						fmt.Printf("Lookup using %s for %s failed: %v\n", pod.Name, name, err)
 					}
 				}
 				if len(failed) == 0 {
 					break
 				}
-		glog.Infof("lookups using %s failed for: %v", pod.Name, failed)
+				fmt.Printf("lookups using %s failed for: %v\n", pod.Name, failed)
 				time.Sleep(10 * time.Second)
 			}
-	if len(failed) != 0 {
-		glog.Errorf("DNS using %s failed for: %v", pod.Name, failed)
-		return false
-	}
+			Expect(len(failed)).To(Equal(0))
 
 			// TODO: probe from the host, too.
 
-	glog.Infof("DNS probes using %s succeeded", pod.Name)
-	return true
-}
-
-var _ = Describe("TestClusterDNS", func() {
-	It("should pass", func() {
-		// TODO: Instead of OrDie, client should Fail the test if there's a problem.
-		// In general tests should Fail() instead of glog.Fatalf().
-		Expect(TestClusterDNS(loadClientOrDie())).To(BeTrue())
+			fmt.Printf("DNS probes using %s succeeded\n", pod.Name)
+		}
 	})
 })