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

e2e: actually check error when we fail to GET the scheduled pod

Browse Source 
and GET the pod before we try to gracefully delete it.
This commit is contained in:
Mike Danese
2016-06-08 20:48:32 -07:00
parent e79f046990
commit 03fd3b6189
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/pods.go
View File

@@ -346,6 +346,11 @@ var _ = framework.KubeDescribe("Pods", func() {
// We need to wait for the pod to be scheduled, otherwise the deletion // We need to wait for the pod to be scheduled, otherwise the deletion
// will be carried out immediately rather than gracefully. // will be carried out immediately rather than gracefully.
framework.ExpectNoError(f.WaitForPodRunning(pod.Name)) framework.ExpectNoError(f.WaitForPodRunning(pod.Name))
// save the scheduled pod
if pod, err = podClient.Get(pod.Name); err != nil {
Expect(err).NotTo(HaveOccurred(), "failed to GET scheduled pod")
}
framework.Logf("scheduled pod: %#v", pod)
By("deleting the pod gracefully") By("deleting the pod gracefully")
if err := podClient.Delete(pod.Name, api.NewDeleteOptions(30)); err != nil { if err := podClient.Delete(pod.Name, api.NewDeleteOptions(30)); err != nil {
@@ -353,7 +358,6 @@ var _ = framework.KubeDescribe("Pods", func() {
} }
By("verifying the kubelet observed the termination notice") By("verifying the kubelet observed the termination notice")
pod, err = podClient.Get(pod.Name)
Expect(wait.Poll(time.Second*5, time.Second*30, func() (bool, error) { Expect(wait.Poll(time.Second*5, time.Second*30, func() (bool, error) {
podList, err := framework.GetKubeletPods(f.Client, pod.Spec.NodeName) podList, err := framework.GetKubeletPods(f.Client, pod.Spec.NodeName)
if err != nil { if err != nil {