Merge pull request #4249 from zmerlynn/more_test_stuff

Eliminate use of glog in test/e2e/util.go, convert functions to return errors

test/e2e/basic.go

@@ -199,8 +199,8 @@ func TestBasic(c *client.Client) bool {
 
 var _ = Describe("TestBasic", func() {
 	It("should pass", func() {
-		// TODO: Instead of OrDie, client should Fail the test if there's a problem.
+		c, err := loadClient()
-		// In general tests should Fail() instead of glog.Fatalf().
+		Expect(err).NotTo(HaveOccurred())
-		Expect(TestBasic(loadClientOrDie())).To(BeTrue())
+		Expect(TestBasic(c)).To(BeTrue())
 	})
 })

test/e2e/endpoints.go

@@ -189,8 +189,8 @@ func TestEndpoints(c *client.Client) bool {
 
 var _ = Describe("TestEndpoints", func() {
 	It("should pass", func() {
-		// TODO: Instead of OrDie, client should Fail the test if there's a problem.
+		c, err := loadClient()
-		// In general tests should Fail() instead of glog.Fatalf().
+		Expect(err).NotTo(HaveOccurred())
-		Expect(TestEndpoints(loadClientOrDie())).To(BeTrue())
+		Expect(TestEndpoints(c)).To(BeTrue())
 	})
 })

test/e2e/events.go

@@ -34,7 +34,9 @@ var _ = Describe("Events", func() {
 	var c *client.Client
 
 	BeforeEach(func() {
-		c = loadClientOrDie()
+		var err error
+		c, err = loadClient()
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("should be sent by kubelets and the scheduler about pods scheduling and running", func() {

test/e2e/liveness.go

@@ -44,8 +44,9 @@ func runLivenessTest(c *client.Client, podDescr *api.Pod) bool {
 	// 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.)
-	if !waitForPodNotPending(c, ns, podDescr.Name) {
+	err = waitForPodNotPending(c, ns, podDescr.Name, 60*time.Second)
-		glog.Infof("Failed to start pod %s in namespace %s", podDescr.Name, ns)
+	if err != nil {
+		glog.Infof("Failed to start pod %s in namespace %s: %v", podDescr.Name, ns, err)
 		return false
 	}
 	glog.Infof("Started pod %s in namespace %s", podDescr.Name, ns)
@@ -137,16 +138,16 @@ func TestLivenessExec(c *client.Client) bool {
 
 var _ = Describe("TestLivenessHttp", func() {
 	It("should pass", func() {
-		// TODO: Instead of OrDie, client should Fail the test if there's a problem.
+		c, err := loadClient()
-		// In general tests should Fail() instead of glog.Fatalf().
+		Expect(err).NotTo(HaveOccurred())
-		Expect(TestLivenessHttp(loadClientOrDie())).To(BeTrue())
+		Expect(TestLivenessHttp(c)).To(BeTrue())
 	})
 })
 
 var _ = Describe("TestLivenessExec", func() {
 	It("should pass", func() {
-		// TODO: Instead of OrDie, client should Fail the test if there's a problem.
+		c, err := loadClient()
-		// In general tests should Fail() instead of glog.Fatalf().
+		Expect(err).NotTo(HaveOccurred())
-		Expect(TestLivenessExec(loadClientOrDie())).To(BeTrue())
+		Expect(TestLivenessExec(c)).To(BeTrue())
 	})
 })

test/e2e/networking.go

@@ -33,7 +33,9 @@ var _ = Describe("Networking", func() {
 	var c *client.Client
 
 	BeforeEach(func() {
-		c = loadClientOrDie()
+		var err error
+		c, err = loadClient()
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("should function for pods", func() {

test/e2e/pods.go

@@ -36,7 +36,9 @@ var _ = Describe("Pods", func() {
 	)
 
 	BeforeEach(func() {
-		c = loadClientOrDie()
+		var err error
+		c, err = loadClient()
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("should be submitted and removed", func() {
@@ -273,10 +275,8 @@ var _ = Describe("Pods", func() {
 		}()
 
 		// Wait for client pod to complete.
-		success := waitForPodSuccess(c, clientPod.Name, clientPod.Spec.Containers[0].Name)
+		err = waitForPodSuccess(c, clientPod.Name, clientPod.Spec.Containers[0].Name, 60*time.Second)
-		if !success {
+		Expect(err).NotTo(HaveOccurred())
-			Fail(fmt.Sprintf("Failed to run client pod to detect service env vars."))
-		}
 
 		// Grab its logs.  Get host first.
 		clientPodStatus, err := c.Pods(api.NamespaceDefault).Get(clientPod.Name)

test/e2e/private.go

@@ -39,8 +39,8 @@ func TestPrivate(c *client.Client) bool {
 
 var _ = Describe("TestPrivate", func() {
 	It("should pass", func() {
-		// TODO: Instead of OrDie, client should Fail the test if there's a problem.
+		c, err := loadClient()
-		// In general tests should Fail() instead of glog.Fatalf().
+		Expect(err).NotTo(HaveOccurred())
-		Expect(TestPrivate(loadClientOrDie())).To(BeTrue())
+		Expect(TestPrivate(c)).To(BeTrue())
 	})
 })

test/e2e/service.go

@@ -32,7 +32,9 @@ var _ = Describe("Services", func() {
 	var c *client.Client
 
 	BeforeEach(func() {
-		c = loadClientOrDie()
+		var err error
+		c, err = loadClient()
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("should provide DNS for the cluster", func() {

test/e2e/util.go

@@ -18,18 +18,14 @@ package e2e
 
 import (
 	"fmt"
-	"io/ioutil"
 	"math/rand"
 	"path/filepath"
 	"strconv"
 	"time"
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/latest"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/clientauth"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/golang/glog"
 
 	. "github.com/onsi/ginkgo"
 )
@@ -61,133 +57,83 @@ func waitForPodRunning(c *client.Client, id string, tryFor time.Duration) error
 }
 
 // waitForPodNotPending returns false if it took too long for the pod to go out of pending state.
-func waitForPodNotPending(c *client.Client, ns, podName string) bool {
+func waitForPodNotPending(c *client.Client, ns, podName string, tryFor time.Duration) error {
-	for i := 0; i < 10; i++ {
+	trySecs := int(tryFor.Seconds())
+	for i := 0; i <= trySecs; i += 5 {
 		if i > 0 {
 			time.Sleep(5 * time.Second)
 		}
 		pod, err := c.Pods(ns).Get(podName)
 		if err != nil {
-			glog.Warningf("Get pod %s in namespace %s failed: %v", podName, ns, err)
+			By(fmt.Sprintf("Get pod %s in namespace %s failed, ignoring for 5s: %v", podName, ns, err))
 			continue
 		}
 		if pod.Status.Phase != api.PodPending {
-			glog.Infof("Saw pod %s in namespace %s out of pending state (found %q)", podName, ns, pod.Status.Phase)
+			By(fmt.Sprintf("Saw pod %s in namespace %s out of pending state (found %q)", podName, ns, pod.Status.Phase))
-			return true
+			return nil
 		}
-		glog.Infof("Waiting for status of pod %s in namespace %s to be !%q (found %q)", podName, ns, api.PodPending, pod.Status.Phase)
+		By(fmt.Sprintf("Waiting for status of pod %s in namespace %s to be !%q (found %q) (%v secs)", podName, ns, api.PodPending, pod.Status.Phase, i))
 	}
-	glog.Warningf("Gave up waiting for status of pod %s in namespace %s to go out of pending", podName, ns)
+	return fmt.Errorf("Gave up waiting for status of pod %s in namespace %s to go out of pending after %d seconds", podName, ns, trySecs)
-	return false
 }
 
 // waitForPodSuccess returns true if the pod reached state success, or false if it reached failure or ran too long.
-func waitForPodSuccess(c *client.Client, podName string, contName string) bool {
+func waitForPodSuccess(c *client.Client, podName string, contName string, tryFor time.Duration) error {
-	for i := 0; i < 10; i++ {
+	trySecs := int(tryFor.Seconds())
+	for i := 0; i <= trySecs; i += 5 {
 		if i > 0 {
 			time.Sleep(5 * time.Second)
 		}
 		pod, err := c.Pods(api.NamespaceDefault).Get(podName)
 		if err != nil {
-			glog.Warningf("Get pod failed: %v", err)
+			By(fmt.Sprintf("Get pod failed, ignoring for 5s: %v", err))
 			continue
 		}
 		// Cannot use pod.Status.Phase == api.PodSucceeded/api.PodFailed due to #2632
 		ci, ok := pod.Status.Info[contName]
 		if !ok {
-			glog.Infof("No Status.Info for container %s in pod %s yet", contName, podName)
+			By(fmt.Sprintf("No Status.Info for container %s in pod %s yet", contName, podName))
 		} else {
 			if ci.State.Termination != nil {
 				if ci.State.Termination.ExitCode == 0 {
-					glog.Infof("Saw pod success")
+					By("Saw pod success")
-					return true
+					return nil
 				} else {
-					glog.Infof("Saw pod failure: %+v", ci.State.Termination)
+					By(fmt.Sprintf("Saw pod failure: %+v", ci.State.Termination))
 				}
-				glog.Infof("Waiting for pod %q status to be success or failure", podName)
+				By(fmt.Sprintf("Waiting for pod %q status to be success or failure", podName))
 			} else {
-				glog.Infof("Nil State.Termination for container %s in pod %s so far", contName, podName)
+				By(fmt.Sprintf("Nil State.Termination for container %s in pod %s so far", contName, podName))
 			}
 		}
 	}
-	glog.Warningf("Gave up waiting for pod %q status to be success or failure", podName)
+	return fmt.Errorf("Gave up waiting for pod %q status to be success or failure after %d seconds", podName, trySecs)
-	return false
 }
 
-// assetPath returns a path to the requested file; safe on all
+func loadClient() (*client.Client, error) {
-// OSes. NOTE: If you use an asset in this test, you MUST add it to
-// the KUBE_TEST_PORTABLE array in hack/lib/golang.sh.
-func assetPath(pathElements ...string) string {
-	return filepath.Join(testContext.repoRoot, filepath.Join(pathElements...))
-}
-
-func loadObjectOrDie(filePath string) runtime.Object {
-	data, err := ioutil.ReadFile(filePath)
-	if err != nil {
-		glog.Fatalf("Failed to read object: %v", err)
-	}
-	return decodeObjectOrDie(data)
-}
-
-func decodeObjectOrDie(data []byte) runtime.Object {
-	obj, err := latest.Codec.Decode(data)
-	if err != nil {
-		glog.Fatalf("Failed to decode object: %v", err)
-	}
-	return obj
-}
-
-func loadPodOrDie(filePath string) *api.Pod {
-	obj := loadObjectOrDie(filePath)
-	pod, ok := obj.(*api.Pod)
-	if !ok {
-		glog.Fatalf("Failed to load pod: %v", obj)
-	}
-	return pod
-}
-
-func loadClientOrDie() *client.Client {
 	config := client.Config{
 		Host: testContext.host,
 	}
 	info, err := clientauth.LoadFromFile(testContext.authConfig)
 	if err != nil {
-		glog.Fatalf("Error loading auth: %v", err)
+		return nil, fmt.Errorf("Error loading auth: %v", err.Error())
 	}
 	// If the certificate directory is provided, set the cert paths to be there.
 	if testContext.certDir != "" {
-		glog.Infof("Expecting certs in %v.", testContext.certDir)
+		By(fmt.Sprintf("Expecting certs in %v.", testContext.certDir))
 		info.CAFile = filepath.Join(testContext.certDir, "ca.crt")
 		info.CertFile = filepath.Join(testContext.certDir, "kubecfg.crt")
 		info.KeyFile = filepath.Join(testContext.certDir, "kubecfg.key")
 	}
 	config, err = info.MergeWithConfig(config)
 	if err != nil {
-		glog.Fatalf("Error creating client")
+		return nil, fmt.Errorf("Error creating client: %v", err.Error())
 	}
 	c, err := client.New(&config)
 	if err != nil {
-		glog.Fatalf("Error creating client")
+		return nil, fmt.Errorf("Error creating client: %v", err.Error())
 	}
-	return c
+	return c, nil
-}
-
-func parsePodOrDie(json string) *api.Pod {
-	obj := decodeObjectOrDie([]byte(json))
-	pod, ok := obj.(*api.Pod)
-	if !ok {
-		glog.Fatalf("Failed to cast pod: %v", obj)
-	}
-	return pod
-}
-
-func parseServiceOrDie(json string) *api.Service {
-	obj := decodeObjectOrDie([]byte(json))
-	service, ok := obj.(*api.Service)
-	if !ok {
-		glog.Fatalf("Failed to cast service: %v", obj)
-	}
-	return service
 }
 
 // TODO: Allow service names to have the same form as names