From 6a97ff529d1f28c2633e7e7049802e0a72079734 Mon Sep 17 00:00:00 2001 From: shahra Date: Wed, 24 Mar 2021 18:26:43 -0700 Subject: [PATCH] Fix check before deleting PV in Snapshot e2e test --- test/e2e/storage/csi_mock_volume.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/e2e/storage/csi_mock_volume.go b/test/e2e/storage/csi_mock_volume.go index fca86304f31..9de18dc5d8e 100644 --- a/test/e2e/storage/csi_mock_volume.go +++ b/test/e2e/storage/csi_mock_volume.go @@ -1347,7 +1347,10 @@ var _ = utils.SIGDescribe("CSI mock volume", func() { framework.Failf("Expected deletion timestamp to be set on snapshotcontent") } - if claim != nil { + // If the claim is non existent, the Get() call on the API server returns + // an non-nil claim object with all fields unset. + // Refer https://github.com/kubernetes/kubernetes/pull/99167#issuecomment-781670012 + if claim != nil && claim.Spec.VolumeName != "" { ginkgo.By(fmt.Sprintf("Wait for PV %s to be deleted", claim.Spec.VolumeName)) err = e2epv.WaitForPersistentVolumeDeleted(m.cs, claim.Spec.VolumeName, framework.Poll, 3*time.Minute) framework.ExpectNoError(err, fmt.Sprintf("failed to delete PV %s", claim.Spec.VolumeName))