drop deprecated PollWithContext and adopt PollUntilContextTimeout instead

Signed-off-by: yintong.huang <yintong.huang@daocloud.io>

Kubernetes-commit: 2db1b321e0edf9e3c4e434353d505cec96bfb319
This commit is contained in:
yintong.huang 2024-06-21 19:23:31 +08:00 committed by Kubernetes Publisher
parent e08149498e
commit 5a2cafd6ec
1 changed files with 3 additions and 3 deletions

View File

@ -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())