Skip to content

Commit 48440bd

Browse files
committed
removed time flaky and added default pod delete timeout
1 parent eb6a1b6 commit 48440bd

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

test/e2e/framework/pv_util.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ func DeletePodWithWait(f *Framework, c clientset.Interface, pod *v1.Pod) error {
507507
// Deletes the named and namespaced pod and waits for the pod to be terminated. Resilient to the pod
508508
// not existing.
509509
func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNamespace string) error {
510-
const maxWait = 5 * time.Minute
511510
Logf("Deleting pod %q in namespace %q", podName, podNamespace)
512511
err := c.CoreV1().Pods(podNamespace).Delete(podName, nil)
513512
if err != nil {
@@ -516,8 +515,8 @@ func DeletePodWithWaitByName(f *Framework, c clientset.Interface, podName, podNa
516515
}
517516
return fmt.Errorf("pod Delete API error: %v", err)
518517
}
519-
Logf("Wait up to %v for pod %q to be fully deleted", maxWait, podName)
520-
err = f.WaitForPodNotFound(podName, maxWait)
518+
Logf("Wait up to %v for pod %q to be fully deleted", PodDeleteTimeout, podName)
519+
err = f.WaitForPodNotFound(podName, PodDeleteTimeout)
521520
if err != nil {
522521
return fmt.Errorf("pod %q was not deleted: %v", podName, err)
523522
}

0 commit comments

Comments
 (0)