@@ -18,6 +18,7 @@ package storage
18
18
19
19
import (
20
20
"context"
21
+
21
22
"github.com/onsi/ginkgo"
22
23
v1 "k8s.io/api/core/v1"
23
24
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -151,14 +152,15 @@ var _ = utils.SIGDescribe("PersistentVolumes GCEPD", func() {
151
152
})
152
153
153
154
// Test that a Pod and PVC attached to a GCEPD successfully unmounts and detaches when the encompassing Namespace is deleted.
154
- ginkgo .It ("should test that deleting the Namespace of a PVC and Pod causes the successful detach of Persistent Disk [Flaky] " , func () {
155
+ ginkgo .It ("should test that deleting the Namespace of a PVC and Pod causes the successful detach of Persistent Disk" , func () {
155
156
156
157
ginkgo .By ("Deleting the Namespace" )
157
158
err := c .CoreV1 ().Namespaces ().Delete (context .TODO (), ns , metav1.DeleteOptions {})
158
159
framework .ExpectNoError (err )
159
160
160
- err = framework .WaitForNamespacesDeleted (c , []string {ns }, framework .DefaultNamespaceDeletionTimeout )
161
- framework .ExpectNoError (err )
161
+ // issue deletes for the client pod and claim, accelerating namespace controller actions
162
+ e2epod .DeletePodOrFail (c , clientPod .Namespace , clientPod .Name )
163
+ framework .ExpectNoError (e2epv .DeletePersistentVolumeClaim (c , pvc .Name , ns ), "Unable to delete PVC " , pvc .Name )
162
164
163
165
ginkgo .By ("Verifying Persistent Disk detaches" )
164
166
framework .ExpectNoError (waitForPDDetach (diskName , node ), "PD " , diskName , " did not detach" )
0 commit comments