From 176730b0f08407509d73535d3ab6b9ffea388b01 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 22 Dec 2024 08:39:09 +0000 Subject: [PATCH] test: fix pv deletion timeout --- test/e2e/storage/framework/volume_resource.go | 2 +- test/e2e/storage/testsuites/provisioning.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/storage/framework/volume_resource.go b/test/e2e/storage/framework/volume_resource.go index 36a02e81a31..9208f39a78b 100644 --- a/test/e2e/storage/framework/volume_resource.go +++ b/test/e2e/storage/framework/volume_resource.go @@ -220,7 +220,7 @@ func (r *VolumeResource) CleanupResource(ctx context.Context) error { } if pv != nil { - err = e2epv.WaitForPersistentVolumeDeleted(ctx, f.ClientSet, pv.Name, 5*time.Second, f.Timeouts.PVDelete) + err = e2epv.WaitForPersistentVolumeDeleted(ctx, f.ClientSet, pv.Name, 5*time.Second, f.Timeouts.PVDeleteSlow) if err != nil { cleanUpErrs = append(cleanUpErrs, fmt.Errorf( "persistent Volume %v not deleted by dynamic provisioner: %w", pv.Name, err)) diff --git a/test/e2e/storage/testsuites/provisioning.go b/test/e2e/storage/testsuites/provisioning.go index 0536dafdc43..bb220b3ade0 100644 --- a/test/e2e/storage/testsuites/provisioning.go +++ b/test/e2e/storage/testsuites/provisioning.go @@ -1187,7 +1187,7 @@ func StopPodAndDependents(ctx context.Context, c clientset.Interface, timeouts * // As with CSI inline volumes, we use the pod delete timeout here because conceptually // the volume deletion needs to be that fast (whatever "that" is). framework.Logf("Wait up to %v for pod PV %s to be fully deleted", timeouts.PodDelete, pv.Name) - framework.ExpectNoError(e2epv.WaitForPersistentVolumeDeleted(ctx, c, pv.Name, 5*time.Second, timeouts.PodDelete)) + framework.ExpectNoError(e2epv.WaitForPersistentVolumeDeleted(ctx, c, pv.Name, 5*time.Second, timeouts.PVDeleteSlow)) } } }