Merge pull request #441 from tsmetana/ocp-fix-e2e-recycler-race

Bug 1870337: UPSTREAM: 96310: PV e2e: fix race in NFS recycling test
openshift · Nov 11, 2020 · 89d6d6e · 89d6d6e
2 parents 9c2f84c + b40bdf1
commit 89d6d6e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/test/e2e/storage/persistent_volumes.go b/test/e2e/storage/persistent_volumes.go
@@ -307,6 +307,11 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
 
 				framework.ExpectNoError(e2epod.DeletePodWithWait(c, pod))
 				framework.Logf("Pod exited without failure; the volume has been recycled.")
+
+				// Delete the PVC and wait for the recycler to finish before the NFS server gets shutdown during cleanup.
+				framework.Logf("Removing second PVC, waiting for the recycler to finish before cleanup.")
+				framework.ExpectNoError(e2epv.DeletePVCandValidatePV(c, ns, pvc, pv, v1.VolumeAvailable))
+				pvc = nil
 			})
 		})
 	})