From 5a2cafd6ec4da1ef1b0de12353a434e940faa5a3 Mon Sep 17 00:00:00 2001 From: "yintong.huang" Date: Fri, 21 Jun 2024 19:23:31 +0800 Subject: [PATCH] drop deprecated PollWithContext and adopt PollUntilContextTimeout instead Signed-off-by: yintong.huang Kubernetes-commit: 2db1b321e0edf9e3c4e434353d505cec96bfb319 --- .../plugin/policy/internal/generic/controller_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/admission/plugin/policy/internal/generic/controller_test.go b/pkg/admission/plugin/policy/internal/generic/controller_test.go index ce277ed9d..5a72e1286 100644 --- a/pkg/admission/plugin/policy/internal/generic/controller_test.go +++ b/pkg/admission/plugin/policy/internal/generic/controller_test.go @@ -496,7 +496,7 @@ func TestInformerList(t *testing.T) { require.NoError(t, tracker.Add(object1)) require.NoError(t, tracker.Add(object2)) - require.NoError(t, wait.PollWithContext(testContext, 100*time.Millisecond, 500*time.Millisecond, func(ctx context.Context) (done bool, err error) { + require.NoError(t, wait.PollUntilContextTimeout(testContext, 100*time.Millisecond, 500*time.Millisecond, false, func(ctx context.Context) (done bool, err error) { return myController.Informer().LastSyncResourceVersion() == object2.GetResourceVersion(), nil })) @@ -508,7 +508,7 @@ func TestInformerList(t *testing.T) { require.NoError(t, tracker.Delete(fakeGVR, object2.GetNamespace(), object2.GetName())) require.NoError(t, tracker.Add(object3)) - require.NoError(t, wait.PollWithContext(testContext, 100*time.Millisecond, 500*time.Millisecond, func(ctx context.Context) (done bool, err error) { + require.NoError(t, wait.PollUntilContextTimeout(testContext, 100*time.Millisecond, 500*time.Millisecond, false, func(ctx context.Context) (done bool, err error) { return myController.Informer().LastSyncResourceVersion() == object3.GetResourceVersion(), nil })) @@ -519,7 +519,7 @@ func TestInformerList(t *testing.T) { require.NoError(t, tracker.Add(namespacedObject1)) require.NoError(t, tracker.Add(namespacedObject2)) - require.NoError(t, wait.PollWithContext(testContext, 100*time.Millisecond, 500*time.Millisecond, func(ctx context.Context) (done bool, err error) { + require.NoError(t, wait.PollUntilContextTimeout(testContext, 100*time.Millisecond, 500*time.Millisecond, false, func(ctx context.Context) (done bool, err error) { return myController.Informer().LastSyncResourceVersion() == namespacedObject2.GetResourceVersion(), nil })) values, err = myController.Informer().Namespaced(namespacedObject1.GetNamespace()).List(labels.Everything())