mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-17 20:00:07 +00:00
test: fix WaitForNamespacedGVRDeletion parameter order
Signed-off-by: Penghao <pewang@redhat.com>
This commit is contained in:
@@ -125,7 +125,7 @@ func CreateSnapshotResource(ctx context.Context, sDriver SnapshottableTestDriver
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
ginkgo.By("checking the Snapshot has been deleted")
|
||||
err = utils.WaitForNamespacedGVRDeletion(ctx, dc, utils.SnapshotGVR, r.Vs.GetName(), r.Vs.GetNamespace(), framework.Poll, timeouts.SnapshotDelete)
|
||||
err = utils.WaitForNamespacedGVRDeletion(ctx, dc, utils.SnapshotGVR, r.Vs.GetNamespace(), r.Vs.GetName(), framework.Poll, timeouts.SnapshotDelete)
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
err = dc.Resource(utils.SnapshotContentGVR).Delete(ctx, r.Vscontent.GetName(), metav1.DeleteOptions{})
|
||||
@@ -212,7 +212,7 @@ func (sr *SnapshotResource) CleanupResource(ctx context.Context, timeouts *frame
|
||||
}
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
err = utils.WaitForNamespacedGVRDeletion(ctx, dc, utils.SnapshotGVR, sr.Vs.GetName(), sr.Vs.GetNamespace(), framework.Poll, timeouts.SnapshotDelete)
|
||||
err = utils.WaitForNamespacedGVRDeletion(ctx, dc, utils.SnapshotGVR, sr.Vs.GetNamespace(), sr.Vs.GetName(), framework.Poll, timeouts.SnapshotDelete)
|
||||
framework.ExpectNoError(err)
|
||||
default:
|
||||
cleanupErrs = append(cleanupErrs, err)
|
||||
|
||||
@@ -404,7 +404,7 @@ func deleteVolumeSnapshot(ctx context.Context, f *framework.Framework, dc dynami
|
||||
vs := sr.Vs
|
||||
|
||||
// Wait for the Snapshot to be actually deleted from API server
|
||||
err := storageutils.WaitForNamespacedGVRDeletion(ctx, dc, storageutils.SnapshotGVR, vs.GetNamespace(), vs.GetNamespace(), framework.Poll, f.Timeouts.SnapshotDelete)
|
||||
err := storageutils.WaitForNamespacedGVRDeletion(ctx, dc, storageutils.SnapshotGVR, vs.GetNamespace(), vs.GetName(), framework.Poll, f.Timeouts.SnapshotDelete)
|
||||
framework.ExpectNoError(err)
|
||||
|
||||
switch pattern.SnapshotDeletionPolicy {
|
||||
|
||||
Reference in New Issue
Block a user