github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 21:50:05 +00:00
Code Issues Projects Releases Wiki Activity

Rename testCleanup to driverCleanup

Browse Source 
Change-Id: I2ee50e2c7eed82724b7a2703819dcefcf7fa915f
This commit is contained in:
Michelle Au
2019-09-09 18:48:43 -07:00
parent 95c7b42340
commit 8d3abb83f9
11 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,8 +73,8 @@ func (t *volumeModeTestSuite) skipRedundantSuite(driver TestDriver, pattern test
func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct {
config *PerTestConfig
testCleanup func()
config *PerTestConfig
driverCleanup func()
cs clientset.Interface
ns *v1.Namespace
@@ -103,7 +103,7 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
l.cs = f.ClientSet
// Now do the more expensive test initialization.
l.config, l.testCleanup = driver.PrepareTest(f)
l.config, l.driverCleanup = driver.PrepareTest(f)
l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
}
@@ -169,9 +169,9 @@ func (t *volumeModeTestSuite) defineTests(driver TestDriver, pattern testpattern
cleanup := func() {
l.cleanupResource()
if l.testCleanup != nil {
l.testCleanup()
l.testCleanup = nil
if l.driverCleanup != nil {
l.driverCleanup()
l.driverCleanup = nil
}
validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps)