Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Utility functions for Gingko By and Fail #4294

Merged
merged 2 commits into from
Feb 12, 2015
Merged

Utility functions for Gingko By and Fail #4294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
251bb58
Add a Logf utility function to print INFO: lines to GinkgoWriter, con…
zmerlynn Feb 10, 2015
6b37468
Add a Failf utility function for 'Fail(fmt.Sprintf())' and convert on…
zmerlynn Feb 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 19 additions & 16 deletions test/e2e/rc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ func ServeImageOrFail(c *client.Client, test string, image string) {
// Resize the replication controller to zero to get rid of pods.
controller.Spec.Replicas = 0
if _, err = c.ReplicationControllers(ns).Update(controller); err != nil {
By(fmt.Sprintf("Failed to resize replication controller %s to zero: %v", name, err))
Logf("Failed to resize replication controller %s to zero: %v", name, err)
}

// Delete the replication controller.
if err = c.ReplicationControllers(ns).Delete(name); err != nil {
By(fmt.Sprintf("Failed to delete replication controller %s: %v", name, err))
Logf("Failed to delete replication controller %s: %v", name, err)
}
}()

Expand All @@ -115,20 +115,21 @@ func ServeImageOrFail(c *client.Client, test string, image string) {
Expect(err).NotTo(HaveOccurred())
t := time.Now()
for {
By(fmt.Sprintf("Controller %s: Found %d pods out of %d", name, len(pods.Items), replicas))
Logf("Controller %s: Found %d pods out of %d", name, len(pods.Items), replicas)
if len(pods.Items) == replicas {
break
}
if time.Since(t) > listTimeout {
Fail(fmt.Sprintf(
"Controller %s: Gave up waiting for %d pods to come up after seeing only %d pods after %v seconds",
name, replicas, len(pods.Items), time.Since(t).Seconds()))
Failf("Controller %s: Gave up waiting for %d pods to come up after seeing only %d pods after %v seconds",
name, replicas, len(pods.Items), time.Since(t).Seconds())
}
time.Sleep(5 * time.Second)
pods, err = c.Pods(ns).List(label)
Expect(err).NotTo(HaveOccurred())
}

By("Ensuring each pod is running and has a hostIP")

// Wait for the pods to enter the running state. Waiting loops until the pods
// are running so non-running pods cause a timeout for this test.
for _, pod := range pods.Items {
Expand All @@ -144,14 +145,14 @@ func ServeImageOrFail(c *client.Client, test string, image string) {
p, err := c.Pods(ns).Get(pod.Name)
Expect(err).NotTo(HaveOccurred())
if p.Status.HostIP != "" {
By(fmt.Sprintf("Controller %s: Replica %d has hostIP: %s", name, i+1, p.Status.HostIP))
Logf("Controller %s: Replica %d has hostIP: %s", name, i+1, p.Status.HostIP)
break
}
if time.Since(t) >= hostIPTimeout {
Fail(fmt.Sprintf("Controller %s: Gave up waiting for hostIP of replica %d after %v seconds",
name, i, time.Since(t).Seconds()))
Failf("Controller %s: Gave up waiting for hostIP of replica %d after %v seconds",
name, i, time.Since(t).Seconds())
}
By(fmt.Sprintf("Controller %s: Retrying to get the hostIP of replica %d", name, i+1))
Logf("Controller %s: Retrying to get the hostIP of replica %d", name, i+1)
time.Sleep(5 * time.Second)
}
}
Expand All @@ -161,24 +162,26 @@ func ServeImageOrFail(c *client.Client, test string, image string) {
Expect(err).NotTo(HaveOccurred())

// Verify that something is listening.
By("Trying to dial each unique pod")

for i, pod := range pods.Items {
resp, err := http.Get(fmt.Sprintf("http://%s:8080", pod.Status.HostIP))
if err != nil {
Fail(fmt.Sprintf("Controller %s: Failed to GET from replica %d: %v", name, i+1, err))
Failf("Controller %s: Failed to GET from replica %d: %v", name, i+1, err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
Fail(fmt.Sprintf("Controller %s: Expected OK status code for replica %d but got %d", name, i+1, resp.StatusCode))
Failf("Controller %s: Expected OK status code for replica %d but got %d", name, i+1, resp.StatusCode)
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
Fail(fmt.Sprintf("Controller %s: Failed to read the body of the GET response from replica %d: %v",
name, i+1, err))
Failf("Controller %s: Failed to read the body of the GET response from replica %d: %v",
name, i+1, err)
}
// The body should be the pod name.
if string(body) != pod.Name {
Fail(fmt.Sprintf("Controller %s: Replica %d expected response %s but got %s", name, i+1, pod.Name, string(body)))
Failf("Controller %s: Replica %d expected response %s but got %s", name, i+1, pod.Name, string(body))
}
By(fmt.Sprintf("Controller %s: Got expected result from replica %d: %s", name, i+1, string(body)))
Logf("Controller %s: Got expected result from replica %d: %s", name, i+1, string(body))
}
}
28 changes: 18 additions & 10 deletions test/e2e/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ type testContextType struct {

var testContext testContextType

func Logf(format string, a ...interface{}) {
fmt.Fprintf(GinkgoWriter, "INFO: "+format+"\n", a...)
}

func Failf(format string, a ...interface{}) {
Fail(fmt.Sprintf(format, a...))
}

func waitForPodRunning(c *client.Client, id string, tryFor time.Duration) error {
trySecs := int(tryFor.Seconds())
for i := 0; i <= trySecs; i += 5 {
Expand All @@ -51,7 +59,7 @@ func waitForPodRunning(c *client.Client, id string, tryFor time.Duration) error
if pod.Status.Phase == api.PodRunning {
return nil
}
By(fmt.Sprintf("Waiting for pod %s status to be %q (found %q) (%d secs)", id, api.PodRunning, pod.Status.Phase, i))
Logf("Waiting for pod %s status to be %q (found %q) (%d secs)", id, api.PodRunning, pod.Status.Phase, i)
}
return fmt.Errorf("Gave up waiting for pod %s to be running after %d seconds", id, trySecs)
}
Expand All @@ -65,14 +73,14 @@ func waitForPodNotPending(c *client.Client, ns, podName string, tryFor time.Dura
}
pod, err := c.Pods(ns).Get(podName)
if err != nil {
By(fmt.Sprintf("Get pod %s in namespace %s failed, ignoring for 5s: %v", podName, ns, err))
Logf("Get pod %s in namespace %s failed, ignoring for 5s: %v", podName, ns, err)
continue
}
if pod.Status.Phase != api.PodPending {
By(fmt.Sprintf("Saw pod %s in namespace %s out of pending state (found %q)", podName, ns, pod.Status.Phase))
Logf("Saw pod %s in namespace %s out of pending state (found %q)", podName, ns, pod.Status.Phase)
return nil
}
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))
Logf("Waiting for status of pod %s in namespace %s to be !%q (found %q) (%v secs)", podName, ns, api.PodPending, pod.Status.Phase, i)
}
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)
}
Expand All @@ -86,24 +94,24 @@ func waitForPodSuccess(c *client.Client, podName string, contName string, tryFor
}
pod, err := c.Pods(api.NamespaceDefault).Get(podName)
if err != nil {
By(fmt.Sprintf("Get pod failed, ignoring for 5s: %v", err))
Logf("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 {
By(fmt.Sprintf("No Status.Info for container %s in pod %s yet", contName, podName))
Logf("No Status.Info for container %s in pod %s yet", contName, podName)
} else {
if ci.State.Termination != nil {
if ci.State.Termination.ExitCode == 0 {
By("Saw pod success")
return nil
} else {
By(fmt.Sprintf("Saw pod failure: %+v", ci.State.Termination))
Logf("Saw pod failure: %+v", ci.State.Termination)
}
By(fmt.Sprintf("Waiting for pod %q status to be success or failure", podName))
Logf("Waiting for pod %q status to be success or failure", podName)
} else {
By(fmt.Sprintf("Nil State.Termination for container %s in pod %s so far", contName, podName))
Logf("Nil State.Termination for container %s in pod %s so far", contName, podName)
}
}
}
Expand All @@ -120,7 +128,7 @@ func loadClient() (*client.Client, error) {
}
// If the certificate directory is provided, set the cert paths to be there.
if testContext.certDir != "" {
By(fmt.Sprintf("Expecting certs in %v.", testContext.certDir))
Logf("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")
Expand Down