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

Move 'defer' call before creation on various e2e tests.

Browse Source
This commit is contained in:
Fabio Yeon
2015-02-23 14:57:08 -08:00
committed by Fabio Yeon
parent 74c0dd179e
commit 0b72391aa0
3 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/events.go
View File

@@ -71,18 +71,16 @@ var _ = Describe("Events", func() {
}
By("submitting the pod to kubernetes")
_, err := podClient.Create(pod)
if err != nil {
Fail(fmt.Sprintf("Failed to create pod: %v", err))
}
defer func() {
By("deleting the pod")
defer GinkgoRecover()
podClient.Delete(pod.Name)
}()
if _, err := podClient.Create(pod); err != nil {
Failf("Failed to create pod: %v", err)
}
By("waiting for the pod to start running")
err = waitForPodRunning(c, pod.Name, 300*time.Second)
err := waitForPodRunning(c, pod.Name, 300*time.Second)
Expect(err).NotTo(HaveOccurred())
By("verifying the pod is in kubernetes")
@@ -92,7 +90,7 @@ var _ = Describe("Events", func() {
By("retrieving the pod")
podWithUid, err := podClient.Get(pod.Name)
if err != nil {
Fail(fmt.Sprintf("Failed to get pod: %v", err))
Failf("Failed to get pod: %v", err)
}
fmt.Printf("%+v\n", podWithUid)
@@ -108,7 +106,7 @@ var _ = Describe("Events", func() {
}.AsSelector(),
)
if err != nil {
Fail(fmt.Sprintf("Error while listing events:", err))
Failf("Error while listing events: %v", err)
}
Expect(len(events.Items)).ToNot(BeZero(), "scheduler events from running pod")
fmt.Println("Saw scheduler event for our pod.")
@@ -125,7 +123,7 @@ var _ = Describe("Events", func() {
}.AsSelector(),
)
if err != nil {
Fail(fmt.Sprintf("Error while listing events:", err))
Failf("Error while listing events: %v", err)
}
Expect(len(events.Items)).ToNot(BeZero(), "kubelet events from running pod")
fmt.Println("Saw kubelet event for our pod.")