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

e2e storage: remove obsolete testCleanups

Browse Source
This commit is contained in:
Patrick Ohly 2022-12-13 18:13:42 +01:00
parent 5943f50dfa
commit f30d1867e6
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/storage/csi_mock/base.go
View File

@ -100,17 +100,16 @@ type testParameters struct {
} }
type mockDriverSetup struct { type mockDriverSetup struct {
cs clientset.Interface cs clientset.Interface
config *storageframework.PerTestConfig config *storageframework.PerTestConfig
testCleanups []func() pods []*v1.Pod
pods []*v1.Pod pvcs []*v1.PersistentVolumeClaim
pvcs []*v1.PersistentVolumeClaim sc map[string]*storagev1.StorageClass
sc map[string]*storagev1.StorageClass vsc map[string]*unstructured.Unstructured
vsc map[string]*unstructured.Unstructured driver drivers.MockCSITestDriver
driver drivers.MockCSITestDriver provisioner string
provisioner string tp testParameters
tp testParameters f *framework.Framework
f *framework.Framework
} }
type volumeType string type volumeType string
@ -236,10 +235,6 @@ func (m *mockDriverSetup) cleanup() {
ginkgo.By(fmt.Sprintf("Deleting volumesnapshotclass %s", vsc.GetName())) ginkgo.By(fmt.Sprintf("Deleting volumesnapshotclass %s", vsc.GetName()))
m.config.Framework.DynamicClient.Resource(utils.SnapshotClassGVR).Delete(context.TODO(), vsc.GetName(), metav1.DeleteOptions{}) m.config.Framework.DynamicClient.Resource(utils.SnapshotClassGVR).Delete(context.TODO(), vsc.GetName(), metav1.DeleteOptions{})
} }
ginkgo.By("Cleaning up resources")
for _, cleanupFunc := range m.testCleanups {
cleanupFunc()
}
err := utilerrors.NewAggregate(errs) err := utilerrors.NewAggregate(errs)
framework.ExpectNoError(err, "while cleaning up after test") framework.ExpectNoError(err, "while cleaning up after test")