github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27111 from mikedanese/err-check 

Automatic merge from submit-queue

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

and GET the pod before we try to gracefully delete it.
and add a debug log.

ref #26224
pull/6/head
k8s-merge-robot 2016-06-12 12:42:26 -07:00 committed by GitHub
parent 5d8710196b 03fd3b6189
commit 6419b43a1f
1 changed files with 5 additions and 1 deletions
Show Stats 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
// will be carried out immediately rather than gracefully.
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")
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")
pod, err = podClient.Get(pod.Name)
Expect(wait.Poll(time.Second*5, time.Second*30, func() (bool, error) {
podList, err := framework.GetKubeletPods(f.Client, pod.Spec.NodeName)
if err != nil {