github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make e2e pod start timeouts uniform

Browse Source
This commit is contained in:
Jeff Lowdermilk
2015-03-05 12:04:00 -08:00
parent 2c286fea4c
commit 083f29158f
8 changed files with 59 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/pods.go
View File

@@ -47,8 +47,7 @@ func runLivenessTest(c *client.Client, podDescr *api.Pod) {
// 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")
expectNoError(waitForPodNotPending(c, ns, podDescr.Name, 60*time.Second),
expectNoError(waitForPodNotPending(c, ns, podDescr.Name),
fmt.Sprintf("starting pod %s in namespace %s", podDescr.Name, ns))
By(fmt.Sprintf("Started pod %s in namespace %s", podDescr.Name, ns))
@@ -190,8 +189,7 @@ var _ = Describe("Pods", func() {
Fail(fmt.Sprintf("Failed to create pod: %v", err))
}
By("waiting for the pod to start running")
expectNoError(waitForPodRunning(c, pod.Name, 300*time.Second))
expectNoError(waitForPodRunning(c, pod.Name))
By("verifying the pod is in kubernetes")
pods, err := podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})))
@@ -213,8 +211,7 @@ var _ = Describe("Pods", func() {
Fail(fmt.Sprintf("Failed to update pod: %v", err))
}
By("waiting for the updated pod to start running")
expectNoError(waitForPodRunning(c, pod.Name, 300*time.Second))
expectNoError(waitForPodRunning(c, pod.Name))
By("verifying the updated pod is in kubernetes")
pods, err = podClient.List(labels.SelectorFromSet(labels.Set(map[string]string{"time": value})))
@@ -246,7 +243,7 @@ var _ = Describe("Pods", func() {
if err != nil {
Fail(fmt.Sprintf("Failed to create serverPod: %v", err))
}
expectNoError(waitForPodRunning(c, serverPod.Name, 300*time.Second))
expectNoError(waitForPodRunning(c, serverPod.Name))
// This service exposes port 8080 of the test pod as a service on port 8765
// TODO(filbranden): We would like to use a unique service name such as:
@@ -305,8 +302,7 @@ var _ = Describe("Pods", func() {
Fail(fmt.Sprintf("Failed to create pod: %v", err))
}
// Wait for client pod to complete.
expectNoError(waitForPodRunning(c, clientPod.Name, 60*time.Second))
expectNoError(waitForPodRunning(c, clientPod.Name))
// Grab its logs. Get host first.
clientPodStatus, err := c.Pods(api.NamespaceDefault).Get(clientPod.Name)