From 497a5bbbe22bab408fc307948e772c181fb9fdcc Mon Sep 17 00:00:00 2001
From: Jon Cope <jcope@redhat.com>
Date: Thu, 6 Apr 2017 16:10:58 -0500
Subject: [PATCH] move PD delete to AfterEach

---
 test/e2e/persistent_volumes-gce.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/e2e/persistent_volumes-gce.go b/test/e2e/persistent_volumes-gce.go
index 34f5afa38a6..ac25971f7c2 100644
--- a/test/e2e/persistent_volumes-gce.go
+++ b/test/e2e/persistent_volumes-gce.go
@@ -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)
+			}
 		}
 	})