github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix storage e2e clean up

Browse Source
This commit is contained in:
caiweidong
2019-10-09 11:15:49 +08:00
parent 1c974109b6
commit 074aba8dce
14 changed files with 112 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/storage/testsuites/volumemode.go
View File

@@ -29,6 +29,7 @@ import (
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
volevents "k8s.io/kubernetes/pkg/controller/volume/events"
@@ -177,13 +178,11 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
}
cleanup := func() {
l.cleanupResource()
if l.driverCleanup != nil {
l.driverCleanup()
l.driverCleanup = nil
}
var errs []error
errs = append(errs, l.cleanupResource())
errs = append(errs, tryFunc(l.driverCleanup))
l.driverCleanup = nil
framework.ExpectNoError(errors.NewAggregate(errs), "while cleaning up resource")
validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps)
}