From 3128b1a773fd184a002501d584411accc60858ba Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Thu, 18 Aug 2022 11:40:27 +0300 Subject: [PATCH] e2e: use user provided timeout in WaitForPodsWithLabelRunningReady The WaitFor* refactoring in 07c34eb40049 had an oversight what timeout parameter is used for calling WaitForAllPodsCondition() in WaitForPodsWithLabelRunningReady() so the calls to WaitForPodsWithLabelRunningReady() ended up ignoring the user provided timeout. Fix that. Signed-off-by: Mikko Ylinen --- test/e2e/framework/pod/wait.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/framework/pod/wait.go b/test/e2e/framework/pod/wait.go index 076bdcc525f..da490106f0c 100644 --- a/test/e2e/framework/pod/wait.go +++ b/test/e2e/framework/pod/wait.go @@ -589,7 +589,7 @@ func WaitForPodsWithLabel(c clientset.Interface, ns string, label labels.Selecto // Return the list of matching pods. func WaitForPodsWithLabelRunningReady(c clientset.Interface, ns string, label labels.Selector, num int, timeout time.Duration) (pods *v1.PodList, err error) { opts := metav1.ListOptions{LabelSelector: label.String()} - return WaitForAllPodsCondition(c, ns, opts, 1, "running and ready", podListTimeout, testutils.PodRunningReady) + return WaitForAllPodsCondition(c, ns, opts, 1, "running and ready", timeout, testutils.PodRunningReady) } // WaitForNRestartablePods tries to list restarting pods using ps until it finds expect of them,