From 48440bdb73fbeb3e85e748cea7c8cf1f56328463 Mon Sep 17 00:00:00 2001 From: pontiyaraja Date: Tue, 12 Mar 2019 12:35:32 +0530 Subject: [PATCH] removed time flaky and added default pod delete timeout --- test/e2e/framework/pv_util.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/framework/pv_util.go b/test/e2e/framework/pv_util.go index bc6e5c97b21..5aff9a3b6c7 100644 --- a/test/e2e/framework/pv_util.go +++ b/test/e2e/framework/pv_util.go @@ -507,7 +507,6 @@ func DeletePodWithWait(f *Framework, c clientset.Interface, pod *v1.Pod) error { // Deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod // not existing. func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNamespace string) error { - const maxWait = 5 * time.Minute Logf("Deleting pod %q in namespace %q", podName, podNamespace) err := c.CoreV1().Pods(podNamespace).Delete(podName, nil) if err != nil { @@ -516,8 +515,8 @@ func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNa } return fmt.Errorf("pod Delete API error: %v", err) } - Logf("Wait up to %v for pod %q to be fully deleted", maxWait, podName) - err = f.WaitForPodNotFound(podName, maxWait) + Logf("Wait up to %v for pod %q to be fully deleted", PodDeleteTimeout, podName) + err = f.WaitForPodNotFound(podName, PodDeleteTimeout) if err != nil { return fmt.Errorf("pod %q was not deleted: %v", podName, err) }