Merge pull request #739 from googs1025/replace

k8s-ci-robot · web-flow · commit 91363037d2c4 · 2024-05-22T19:45:29.000-07:00
replace deprecated method
diff --git a/pkg/controllers/elasticquota_controller_test.go b/pkg/controllers/elasticquota_controller_test.go
@@ -203,8 +203,7 @@ func TestElasticQuotaController_Run(t *testing.T) {
 					t.Errorf("reconcile: (%v)", err)
 				}
 			}
-
-			err := wait.Poll(200*time.Millisecond, 1*time.Second, func() (done bool, err error) {
+			err := wait.PollUntilContextTimeout(ctx, 200*time.Millisecond, 1*time.Second, false, func(ctx context.Context) (done bool, err error) {
 				for _, v := range c.want {
 					eq := &v1alpha1.ElasticQuota{
 						ObjectMeta: metav1.ObjectMeta{
diff --git a/pkg/networkaware/networkoverhead/networkoverhead_test.go b/pkg/networkaware/networkoverhead/networkoverhead_test.go
@@ -549,7 +549,7 @@ func BenchmarkNetworkOverheadPreFilter(b *testing.B) {
 			state := framework.NewCycleState()
 
 			// Wait for the pods to be scheduled.
-			if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 				return true, nil
 			}); err != nil {
 				b.Errorf("pods not scheduled yet: %v ", err)
@@ -767,7 +767,7 @@ func TestNetworkOverheadScore(t *testing.T) {
 			}
 
 			// Wait for the pods to be scheduled.
-			if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 				return true, nil
 			}); err != nil {
 				t.Errorf("pods not scheduled yet: %v ", err)
@@ -1016,7 +1016,7 @@ func BenchmarkNetworkOverheadScore(b *testing.B) {
 			state := framework.NewCycleState()
 
 			// Wait for the pods to be scheduled.
-			if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 				return true, nil
 			}); err != nil {
 				b.Errorf("pods not scheduled yet: %v ", err)
@@ -1245,7 +1245,7 @@ func TestNetworkOverheadFilter(t *testing.T) {
 			}
 
 			// Wait for the pods to be scheduled.
-			if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 				return true, nil
 			}); err != nil {
 				t.Errorf("pods not scheduled yet: %v ", err)
@@ -1471,7 +1471,7 @@ func BenchmarkNetworkOverheadFilter(b *testing.B) {
 			}
 
 			// Wait for the pods to be scheduled.
-			if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 				return true, nil
 			}); err != nil {
 				b.Errorf("pods not scheduled yet: %v ", err)
diff --git a/test/integration/allocatable_test.go b/test/integration/allocatable_test.go
@@ -134,7 +134,7 @@ func TestAllocatablePlugin(t *testing.T) {
 
 	for i := range pods {
 		// Wait for the pod to be scheduled.
-		err := wait.Poll(1*time.Second, 60*time.Second, func() (bool, error) {
+		err := wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 60*time.Second, false, func(ctx context.Context) (bool, error) {
 			return podScheduled(cs, pods[i].Namespace, pods[i].Name), nil
 		})
 		if err != nil {
diff --git a/test/integration/capacity_scheduling_test.go b/test/integration/capacity_scheduling_test.go
@@ -48,7 +48,7 @@ func TestCapacityScheduling(t *testing.T) {
 	testCtx.ClientSet = cs
 	testCtx.KubeConfig = globalKubeConfig
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -522,7 +522,7 @@ func TestCapacityScheduling(t *testing.T) {
 				}
 			}
 
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, pod := range tt.existPods {
 					if !podScheduled(cs, pod.Namespace, pod.Name) {
 						return false, nil
@@ -541,7 +541,7 @@ func TestCapacityScheduling(t *testing.T) {
 				}
 			}
 
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, v := range tt.expectedPods {
 					if !podScheduled(cs, v.Namespace, v.Name) {
 						return false, nil
diff --git a/test/integration/coscheduling_test.go b/test/integration/coscheduling_test.go
@@ -53,7 +53,7 @@ func TestCoschedulingPlugin(t *testing.T) {
 	testCtx.ClientSet = cs
 	testCtx.KubeConfig = globalKubeConfig
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -361,7 +361,7 @@ func TestCoschedulingPlugin(t *testing.T) {
 					t.Fatalf("Failed to create Pod %q: %v", tt.pods[i].Name, err)
 				}
 			}
-			err = wait.Poll(1*time.Second, 120*time.Second, func() (bool, error) {
+			err = wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 120*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, v := range tt.expectedPods {
 					if !podScheduled(cs, ns, v) {
 						return false, nil
@@ -386,7 +386,7 @@ func TestPodgroupBackoff(t *testing.T) {
 	testCtx.ClientSet = cs
 	testCtx.KubeConfig = globalKubeConfig
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -539,7 +539,7 @@ func TestPodgroupBackoff(t *testing.T) {
 					t.Fatalf("Failed to create Pod %q: %v", tt.pods[i].Name, err)
 				}
 			}
-			err = wait.Poll(1*time.Second, 120*time.Second, func() (bool, error) {
+			err = wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 120*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, v := range tt.expectedPods {
 					if !podScheduled(cs, ns, v) {
 						return false, nil
diff --git a/test/integration/elasticquota_controller_test.go b/test/integration/elasticquota_controller_test.go
@@ -78,7 +78,7 @@ func TestElasticController(t *testing.T) {
 		}
 	}()
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -301,7 +301,7 @@ func TestElasticController(t *testing.T) {
 					}
 				}
 			}
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, pod := range tt.incomingPods {
 					if !podScheduled(cs, pod.Namespace, pod.Name) {
 						return false, nil
@@ -312,10 +312,10 @@ func TestElasticController(t *testing.T) {
 				t.Fatalf("%v Waiting existPods created error: %v", tt.name, err.Error())
 			}
 
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, v := range tt.used {
 					var eq schedv1alpha1.ElasticQuota
-					if err := extClient.Get(testCtx.Ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &eq); err != nil {
+					if err := extClient.Get(ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &eq); err != nil {
 						// This could be a connection error so we want to retry.
 						klog.ErrorS(err, "Failed to obtain the elasticQuota clientSet")
 						return false, err
@@ -335,7 +335,7 @@ func TestElasticController(t *testing.T) {
 					t.Fatalf("Failed to update Pod status %q: %v", pod.Name, err)
 				}
 			}
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, pod := range tt.incomingPods {
 					if !podScheduled(cs, pod.Namespace, pod.Name) {
 						return false, nil
@@ -346,10 +346,10 @@ func TestElasticController(t *testing.T) {
 				t.Fatalf("%v Waiting nextPods update status error: %v", tt.name, err.Error())
 			}
 
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, v := range tt.want {
 					var eq schedv1alpha1.ElasticQuota
-					if err := extClient.Get(testCtx.Ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &eq); err != nil {
+					if err := extClient.Get(ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &eq); err != nil {
 						// This could be a connection error so we want to retry.
 						klog.ErrorS(err, "Failed to obtain the elasticQuota clientSet")
 						return false, err
diff --git a/test/integration/loadVariationRiskBalancing_test.go b/test/integration/loadVariationRiskBalancing_test.go
@@ -183,7 +183,7 @@ func TestLoadVariationRiskBalancingPlugin(t *testing.T) {
 
 	expected := [2]string{"node-1", "node-1"}
 	for i := range newPods {
-		err := wait.Poll(1*time.Second, 10*time.Second, func() (bool, error) {
+		err := wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 			return podScheduled(cs, newPods[i].Namespace, newPods[i].Name), nil
 		})
 		assert.Nil(t, err)
diff --git a/test/integration/lowriskovercommitment_test.go b/test/integration/lowriskovercommitment_test.go
@@ -197,7 +197,7 @@ func TestLowRiskOverCommitmentPlugin(t *testing.T) {
 
 	expectedNodes := []string{"node-1"}
 	for i := numExistingPods; i < numPods; i++ {
-		err = wait.Poll(1*time.Second, 10*time.Second, func() (bool, error) {
+		err = wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 			return podScheduled(cs, pods[i].Namespace, pods[i].Name), nil
 		})
 		assert.Nil(t, err)
diff --git a/test/integration/networkoverhead_test.go b/test/integration/networkoverhead_test.go
@@ -65,7 +65,7 @@ func TestNetworkOverheadPlugin(t *testing.T) {
 	testCtx.ClientSet = cs
 	testCtx.KubeConfig = globalKubeConfig
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -81,7 +81,7 @@ func TestNetworkOverheadPlugin(t *testing.T) {
 		t.Fatalf("Timed out waiting for AppGroup CRD to be ready: %v", err)
 	}
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -279,7 +279,7 @@ func TestNetworkOverheadPlugin(t *testing.T) {
 			for _, p := range tt.pods {
 				if len(tt.expectedNodes) > 0 {
 					// Wait for the pod to be scheduled.
-					if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+					if err := wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 						return podScheduled(cs, ns, p.Name), nil
 
 					}); err != nil {
diff --git a/test/integration/noderesourcetopology_cache_test.go b/test/integration/noderesourcetopology_cache_test.go
@@ -889,9 +889,9 @@ func waitForPodList(cs clientset.Interface, podDescs []podDesc, timeout time.Dur
 			defer wg.Done()
 
 			var updatedPod *corev1.Pod
-			err := wait.Poll(5*time.Second, timeout, func() (bool, error) {
+			err := wait.PollUntilContextTimeout(context.TODO(), 5*time.Second, timeout, false, func(ctx context.Context) (bool, error) {
 				var nerr error
-				updatedPod, nerr = cs.CoreV1().Pods(pod.Namespace).Get(context.TODO(), pod.Name, metav1.GetOptions{})
+				updatedPod, nerr = cs.CoreV1().Pods(pod.Namespace).Get(ctx, pod.Name, metav1.GetOptions{})
 				if nerr != nil {
 					klog.ErrorS(nerr, "Failed to get pod", "pod", klog.KRef(pod.Namespace, pod.Name))
 					return false, nerr
diff --git a/test/integration/noderesourcetopology_test.go b/test/integration/noderesourcetopology_test.go
@@ -144,7 +144,7 @@ func TestTopologyMatchPlugin(t *testing.T) {
 	testCtx.ClientSet = cs
 	testCtx.KubeConfig = globalKubeConfig
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -1984,7 +1984,7 @@ func TestTopologyMatchPlugin(t *testing.T) {
 			for _, p := range tt.pods {
 				if len(tt.expectedNodes) > 0 {
 					// Wait for the pod to be scheduled.
-					if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+					if err := wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 						return podScheduled(cs, ns, p.Name), nil
 
 					}); err != nil {
@@ -2008,7 +2008,7 @@ func TestTopologyMatchPlugin(t *testing.T) {
 					// wait for the pod scheduling to failed.
 					var err error
 					var events []v1.Event
-					if err := wait.Poll(5*time.Second, 20*time.Second, func() (bool, error) {
+					if err := wait.PollUntilContextTimeout(testCtx.Ctx, 5*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 						events, err = getPodEvents(cs, ns, p.Name)
 						if err != nil {
 							// This could be a connection error, so we want to retry.
diff --git a/test/integration/nrtutils.go b/test/integration/nrtutils.go
@@ -50,7 +50,7 @@ const (
 )
 
 func waitForNRT(cs *clientset.Clientset) error {
-	return wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	return wait.PollUntilContextTimeout(context.TODO(), 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -205,8 +205,8 @@ func (n *nrtWrapper) Obj() *topologyv1alpha2.NodeResourceTopology {
 func podIsScheduled(interval time.Duration, times int, cs clientset.Interface, podNamespace, podName string) (*corev1.Pod, error) {
 	var err error
 	var pod *corev1.Pod
-	waitErr := wait.Poll(interval, time.Duration(times)*interval, func() (bool, error) {
-		pod, err = cs.CoreV1().Pods(podNamespace).Get(context.TODO(), podName, metav1.GetOptions{})
+	waitErr := wait.PollUntilContextTimeout(context.TODO(), interval, time.Duration(times)*interval, false, func(ctx context.Context) (bool, error) {
+		pod, err = cs.CoreV1().Pods(podNamespace).Get(ctx, podName, metav1.GetOptions{})
 		if err != nil {
 			// This could be a connection error so we want to retry.
 			klog.ErrorS(err, "Failed to get pod", "pod", klog.KRef(podNamespace, podName))
diff --git a/test/integration/pod_state_test.go b/test/integration/pod_state_test.go
@@ -128,7 +128,7 @@ func TestPodStatePlugin(t *testing.T) {
 				pods = append(pods, p)
 
 				// Ensure the existing Pods are scheduled successfully except for the nominated pods.
-				if err := wait.Poll(1*time.Second, 20*time.Second, func() (bool, error) {
+				if err := wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
 					return podScheduled(cs, ns, pod.Name), nil
 				}); err != nil {
 					t.Logf("pod %q failed to be scheduled", pod.Name)
@@ -151,7 +151,7 @@ func TestPodStatePlugin(t *testing.T) {
 			defer cleanupPods(t, testCtx, []*v1.Pod{p})
 
 			// Ensure the Pod is scheduled successfully.
-			if err := wait.Poll(1*time.Second, 60*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, 1*time.Second, 60*time.Second, false, func(ctx context.Context) (bool, error) {
 				return podScheduled(cs, ns, tt.pod.Name), nil
 			}); err != nil {
 				t.Errorf("pod %q failed to be scheduled: %v", tt.pod.Name, err)
diff --git a/test/integration/podgroup_controller_test.go b/test/integration/podgroup_controller_test.go
@@ -83,7 +83,7 @@ func TestPodGroupController(t *testing.T) {
 		}
 	}()
 
-	if err := wait.Poll(100*time.Millisecond, 3*time.Second, func() (done bool, err error) {
+	if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100*time.Millisecond, 3*time.Second, false, func(ctx context.Context) (done bool, err error) {
 		groupList, _, err := cs.ServerGroupsAndResources()
 		if err != nil {
 			return false, nil
@@ -291,7 +291,7 @@ func TestPodGroupController(t *testing.T) {
 					}
 				}
 			}
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, pod := range tt.incomingPods {
 					if !podScheduled(cs, ns, pod.Name) {
 						return false, nil
@@ -302,10 +302,10 @@ func TestPodGroupController(t *testing.T) {
 				t.Fatalf("%v Waiting existPods create error: %v", tt.name, err.Error())
 			}
 
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, v := range tt.intermediatePGState {
 					var pg v1alpha1.PodGroup
-					if err := extClient.Get(testCtx.Ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &pg); err != nil {
+					if err := extClient.Get(ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &pg); err != nil {
 						// This could be a connection error so we want to retry.
 						klog.ErrorS(err, "Failed to obtain the PodGroup clientSet")
 						return false, err
@@ -327,7 +327,7 @@ func TestPodGroupController(t *testing.T) {
 				}
 			}
 			// wait for all incomingPods to be scheduled
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, pod := range tt.incomingPods {
 					if !podScheduled(cs, pod.Namespace, pod.Name) {
 						return false, nil
@@ -338,10 +338,10 @@ func TestPodGroupController(t *testing.T) {
 				t.Fatalf("%v Waiting incomingPods scheduled error: %v", tt.name, err.Error())
 			}
 
-			if err := wait.Poll(time.Millisecond*200, 10*time.Second, func() (bool, error) {
+			if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond*200, 10*time.Second, false, func(ctx context.Context) (bool, error) {
 				for _, v := range tt.expectedPGState {
 					var pg v1alpha1.PodGroup
-					if err := extClient.Get(testCtx.Ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &pg); err != nil {
+					if err := extClient.Get(ctx, types.NamespacedName{Namespace: v.Namespace, Name: v.Name}, &pg); err != nil {
 						// This could be a connection error so we want to retry.
 						klog.ErrorS(err, "Failed to obtain the PodGroup clientSet")
 						return false, err
diff --git a/test/integration/preemption_toleration_test.go b/test/integration/preemption_toleration_test.go
diff --git a/test/integration/qos_test.go b/test/integration/qos_test.go
diff --git a/test/integration/sysched_test.go b/test/integration/sysched_test.go
diff --git a/test/integration/targetloadpacking_test.go b/test/integration/targetloadpacking_test.go
diff --git a/test/integration/topologicalsort_test.go b/test/integration/topologicalsort_test.go
diff --git a/test/integration/utils.go b/test/integration/utils.go

Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,7 @@ func TestElasticQuotaController_Run(t *testing.T) {`
`203`	`203`	`t.Errorf("reconcile: (%v)", err)`
`204`	`204`	`}`
`205`	`205`	`}`
`206`		`-`
`207`		`- err := wait.Poll(200time.Millisecond, 1time.Second, func() (done bool, err error) {`
	`206`	`+ err := wait.PollUntilContextTimeout(ctx, 200time.Millisecond, 1time.Second, false, func(ctx context.Context) (done bool, err error) {`
`208`	`207`	`for _, v := range c.want {`
`209`	`208`	`eq := &v1alpha1.ElasticQuota{`
`210`	`209`	`ObjectMeta: metav1.ObjectMeta{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func TestCapacityScheduling(t *testing.T) {`
`48`	`48`	`testCtx.ClientSet = cs`
`49`	`49`	`testCtx.KubeConfig = globalKubeConfig`
`50`	`50`
`51`		`- if err := wait.Poll(100time.Millisecond, 3time.Second, func() (done bool, err error) {`
	`51`	`+ if err := wait.PollUntilContextTimeout(testCtx.Ctx, 100time.Millisecond, 3time.Second, false, func(ctx context.Context) (done bool, err error) {`
`52`	`52`	`groupList, _, err := cs.ServerGroupsAndResources()`
`53`	`53`	`if err != nil {`
`54`	`54`	`return false, nil`
`@@ -522,7 +522,7 @@ func TestCapacityScheduling(t *testing.T) {`
`522`	`522`	`}`
`523`	`523`	`}`
`524`	`524`
`525`		`- if err := wait.Poll(time.Millisecond200, 10time.Second, func() (bool, error) {`
	`525`	`+ if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond200, 10time.Second, false, func(ctx context.Context) (bool, error) {`
`526`	`526`	`for _, pod := range tt.existPods {`
`527`	`527`	`if !podScheduled(cs, pod.Namespace, pod.Name) {`
`528`	`528`	`return false, nil`
`@@ -541,7 +541,7 @@ func TestCapacityScheduling(t *testing.T) {`
`541`	`541`	`}`
`542`	`542`	`}`
`543`	`543`
`544`		`- if err := wait.Poll(time.Millisecond200, 10time.Second, func() (bool, error) {`
	`544`	`+ if err := wait.PollUntilContextTimeout(testCtx.Ctx, time.Millisecond200, 10time.Second, false, func(ctx context.Context) (bool, error) {`
`545`	`545`	`for _, v := range tt.expectedPods {`
`546`	`546`	`if !podScheduled(cs, v.Namespace, v.Name) {`
`547`	`547`	`return false, nil`