move PD delete to AfterEach

This commit is contained in:
Jon Cope 2017-04-06 16:10:58 -05:00
parent 08fefc9d9a
commit 497a5bbbe2

View File

@ -107,12 +107,9 @@ var _ = framework.KubeDescribe("PersistentVolumes:GCEPD [Volume]", func() {
framework.DeletePodWithWait(f, c, clientPod)
framework.PVPVCCleanup(c, ns, pv, pvc)
clientPod, pv, pvc, node = nil, nil, nil, ""
}
})
AddCleanupAction(func() {
if len(diskName) > 0 {
framework.DeletePDWithRetry(diskName)
if diskName != "" {
framework.DeletePDWithRetry(diskName)
}
}
})