github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix nil pointer in test AfterEach for volumeperf.go

Browse Source
This commit is contained in:
Sunny Song 2023-04-14 19:54:06 +00:00
parent f33c4a1c79
commit e340325024
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/storage/testsuites/volumeperf.go
View File

@ -129,18 +129,25 @@ func (t *volumePerformanceTestSuite) DefineTests(driver storageframework.TestDri
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
ginkgo.AfterEach(func(ctx context.Context) {
ginkgo.By("Closing informer channel")
close(l.stopCh)
ginkgo.By("Deleting all PVCs")
for _, pvc := range l.pvcs {
err := e2epv.DeletePersistentVolumeClaim(ctx, l.cs, pvc.Name, pvc.Namespace)
framework.ExpectNoError(err)
err = e2epv.WaitForPersistentVolumeDeleted(ctx, l.cs, pvc.Spec.VolumeName, 1*time.Second, 5*time.Minute)
if l != nil {
if l.stopCh != nil {
ginkgo.By("Closing informer channel")
close(l.stopCh)
}
ginkgo.By("Deleting all PVCs")
for _, pvc := range l.pvcs {
err := e2epv.DeletePersistentVolumeClaim(ctx, l.cs, pvc.Name, pvc.Namespace)
framework.ExpectNoError(err)
err = e2epv.WaitForPersistentVolumeDeleted(ctx, l.cs, pvc.Spec.VolumeName, 1*time.Second, 5*time.Minute)
framework.ExpectNoError(err)
}
ginkgo.By(fmt.Sprintf("Deleting Storage Class %s", l.scName))
err := l.cs.StorageV1().StorageClasses().Delete(ctx, l.scName, metav1.DeleteOptions{})
framework.ExpectNoError(err)
} else {
ginkgo.By("Local l setup is nil")
}
ginkgo.By(fmt.Sprintf("Deleting Storage Class %s", l.scName))
err := l.cs.StorageV1().StorageClasses().Delete(ctx, l.scName, metav1.DeleteOptions{})
framework.ExpectNoError(err)
})
ginkgo.It("should provision volumes at scale within performance constraints [Slow] [Serial]", func(ctx context.Context) {