From 52f87963a472e1ba22223d137ee0ace4efdd6b57 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Sirot Date: Thu, 13 Sep 2018 14:03:56 +0200 Subject: [PATCH] Move pod created into kube-system namespace delete call into a defer block to be sure the clean-up is done even when the test failed Signed-off-by: Jean-Christophe Sirot --- test/e2e/scheduling/preemption.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/test/e2e/scheduling/preemption.go b/test/e2e/scheduling/preemption.go index 1ee85ede306..3ad1384685f 100644 --- a/test/e2e/scheduling/preemption.go +++ b/test/e2e/scheduling/preemption.go @@ -175,6 +175,11 @@ var _ = SIGDescribe("SchedulerPreemption [Serial] [Feature:PodPreemption]", func }) // Make sure that the lowest priority pod is deleted. preemptedPod, err := cs.CoreV1().Pods(pods[0].Namespace).Get(pods[0].Name, metav1.GetOptions{}) + defer func() { + // Clean-up the critical pod + err := f.ClientSet.CoreV1().Pods(metav1.NamespaceSystem).Delete("critical-pod", metav1.NewDeleteOptions(0)) + framework.ExpectNoError(err) + }() podDeleted := (err != nil && errors.IsNotFound(err)) || (err == nil && preemptedPod.DeletionTimestamp != nil) Expect(podDeleted).To(BeTrue()) @@ -184,9 +189,6 @@ var _ = SIGDescribe("SchedulerPreemption [Serial] [Feature:PodPreemption]", func framework.ExpectNoError(err) Expect(livePod.DeletionTimestamp).To(BeNil()) } - // Clean-up the critical pod - err = f.ClientSet.CoreV1().Pods(metav1.NamespaceSystem).Delete("critical-pod", metav1.NewDeleteOptions(0)) - framework.ExpectNoError(err) }) // This test verifies that when a high priority pod is pending and its @@ -341,11 +343,13 @@ var _ = SIGDescribe("PodPriorityResolution [Serial] [Feature:PodPreemption]", fu Namespace: metav1.NamespaceSystem, PriorityClassName: spc, }) + defer func() { + // Clean-up the pod. + err := f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(pod.Name, metav1.NewDeleteOptions(0)) + framework.ExpectNoError(err) + }() Expect(pod.Spec.Priority).NotTo(BeNil()) framework.Logf("Created pod: %v", pod.Name) - // Clean-up the pod. - err := f.ClientSet.CoreV1().Pods(pod.Namespace).Delete(pod.Name, metav1.NewDeleteOptions(0)) - framework.ExpectNoError(err) } }) })