github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,8 +61,8 @@ func (s *disruptiveTestSuite) skipRedundantSuite(driver TestDriver, pattern test
func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
cs clientset.Interface cs clientset.Interface
ns *v1.Namespace ns *v1.Namespace
@ -87,7 +87,7 @@ func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpattern
l.cs = f.ClientSet l.cs = f.ClientSet
// Now do the more expensive test initialization. // Now do the more expensive test initialization.
l.config, l.testCleanup = driver.PrepareTest(f) l.config, l.driverCleanup = driver.PrepareTest(f)
if pattern.VolMode == v1.PersistentVolumeBlock && !driver.GetDriverInfo().Capabilities[CapBlock] { if pattern.VolMode == v1.PersistentVolumeBlock && !driver.GetDriverInfo().Capabilities[CapBlock] {
framework.Skipf("Driver %s doesn't support %v -- skipping", driver.GetDriverInfo().Name, pattern.VolMode) framework.Skipf("Driver %s doesn't support %v -- skipping", driver.GetDriverInfo().Name, pattern.VolMode)
@ -109,9 +109,9 @@ func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpattern
l.resource = nil l.resource = nil
} }
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
} }

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

@ -65,8 +65,8 @@ func (p *ephemeralTestSuite) skipRedundantSuite(driver TestDriver, pattern testp
func (p *ephemeralTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (p *ephemeralTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
testCase *EphemeralTest testCase *EphemeralTest
} }
@ -94,7 +94,7 @@ func (p *ephemeralTestSuite) defineTests(driver TestDriver, pattern testpatterns
l = local{} l = local{}
// Now do the more expensive test initialization. // Now do the more expensive test initialization.
l.config, l.testCleanup = driver.PrepareTest(f) l.config, l.driverCleanup = driver.PrepareTest(f)
l.testCase = &EphemeralTest{ l.testCase = &EphemeralTest{
Client: l.config.Framework.ClientSet, Client: l.config.Framework.ClientSet,
Namespace: f.Namespace.Name, Namespace: f.Namespace.Name,
@ -107,9 +107,9 @@ func (p *ephemeralTestSuite) defineTests(driver TestDriver, pattern testpatterns
} }
cleanup := func() { cleanup := func() {
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
} }

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

@ -63,8 +63,8 @@ func (t *multiVolumeTestSuite) skipRedundantSuite(driver TestDriver, pattern tes
func (t *multiVolumeTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (t *multiVolumeTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
cs clientset.Interface cs clientset.Interface
ns *v1.Namespace ns *v1.Namespace
@ -99,7 +99,7 @@ func (t *multiVolumeTestSuite) defineTests(driver TestDriver, pattern testpatter
l.driver = driver l.driver = driver
// Now do the more expensive test initialization. // 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) l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
} }
@ -108,9 +108,9 @@ func (t *multiVolumeTestSuite) defineTests(driver TestDriver, pattern testpatter
resource.cleanupResource() resource.cleanupResource()
} }
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps) validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps)

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

@ -87,8 +87,8 @@ func (p *provisioningTestSuite) skipRedundantSuite(driver TestDriver, pattern te
func (p *provisioningTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (p *provisioningTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
testCase *StorageClassTest testCase *StorageClassTest
cs clientset.Interface cs clientset.Interface
@ -127,7 +127,7 @@ func (p *provisioningTestSuite) defineTests(driver TestDriver, pattern testpatte
l = local{} l = local{}
// Now do the more expensive test initialization. // 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) l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
l.cs = l.config.Framework.ClientSet l.cs = l.config.Framework.ClientSet
claimSize := dDriver.GetClaimSize() claimSize := dDriver.GetClaimSize()
@ -155,9 +155,9 @@ func (p *provisioningTestSuite) defineTests(driver TestDriver, pattern testpatte
} }
cleanup := func() { cleanup := func() {
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps) validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps)

4
test/e2e/storage/testsuites/snapshottable.go
View File

@ -101,8 +101,8 @@ func (s *snapshottableTestSuite) defineTests(driver TestDriver, pattern testpatt
dc := f.DynamicClient dc := f.DynamicClient
// Now do the more expensive test initialization. // Now do the more expensive test initialization.
config, testCleanup := driver.PrepareTest(f) config, driverCleanup := driver.PrepareTest(f)
defer testCleanup() defer driverCleanup()
vsc := sDriver.GetSnapshotClass(config) vsc := sDriver.GetSnapshotClass(config)
class := dDriver.GetDynamicProvisionStorageClass(config, "") class := dDriver.GetDynamicProvisionStorageClass(config, "")

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

@ -81,8 +81,8 @@ func (s *subPathTestSuite) skipRedundantSuite(driver TestDriver, pattern testpat
func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
resource *genericVolumeTestResource resource *genericVolumeTestResource
roVolSource *v1.VolumeSource roVolSource *v1.VolumeSource
@ -109,7 +109,7 @@ func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
l = local{} l = local{}
// Now do the more expensive test initialization. // 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, driver.GetDriverInfo().InTreePluginName) l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName)
l.resource = createGenericVolumeTestResource(driver, l.config, pattern) l.resource = createGenericVolumeTestResource(driver, l.config, pattern)
@ -165,9 +165,9 @@ func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
l.resource = nil l.resource = nil
} }
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
validateMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName, l.intreeOps, l.migratedOps) validateMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName, l.intreeOps, l.migratedOps)

10
test/e2e/storage/testsuites/topology.go
View File

@ -40,8 +40,8 @@ type topologyTestSuite struct {
} }
type topologyTest struct { type topologyTest struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
intreeOps opCounts intreeOps opCounts
migratedOps opCounts migratedOps opCounts
@ -109,7 +109,7 @@ func (t *topologyTestSuite) defineTests(driver TestDriver, pattern testpatterns.
l := topologyTest{} l := topologyTest{}
// Now do the more expensive test initialization. // Now do the more expensive test initialization.
l.config, l.testCleanup = driver.PrepareTest(f) l.config, l.driverCleanup = driver.PrepareTest(f)
l.resource = genericVolumeTestResource{ l.resource = genericVolumeTestResource{
driver: driver, driver: driver,
@ -151,8 +151,8 @@ func (t *topologyTestSuite) defineTests(driver TestDriver, pattern testpatterns.
cleanup := func(l topologyTest) { cleanup := func(l topologyTest) {
t.cleanupResources(cs, &l) t.cleanupResources(cs, &l)
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
} }
validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps) validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps)

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

@ -70,8 +70,8 @@ func (v *volumeExpandTestSuite) skipRedundantSuite(driver TestDriver, pattern te
func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
resource *genericVolumeTestResource resource *genericVolumeTestResource
pod *v1.Pod pod *v1.Pod
@ -102,7 +102,7 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
l = local{} l = local{}
// Now do the more expensive test initialization. // 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, driver.GetDriverInfo().InTreePluginName) l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName)
l.resource = createGenericVolumeTestResource(driver, l.config, pattern) l.resource = createGenericVolumeTestResource(driver, l.config, pattern)
} }
@ -127,9 +127,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte
l.resource = nil l.resource = nil
} }
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
validateMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName, l.intreeOps, l.migratedOps) validateMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName, l.intreeOps, l.migratedOps)

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

@ -84,8 +84,8 @@ func (t *volumeIOTestSuite) skipRedundantSuite(driver TestDriver, pattern testpa
func (t *volumeIOTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (t *volumeIOTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
resource *genericVolumeTestResource resource *genericVolumeTestResource
@ -109,7 +109,7 @@ func (t *volumeIOTestSuite) defineTests(driver TestDriver, pattern testpatterns.
l = local{} l = local{}
// Now do the more expensive test initialization. // 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) l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
l.resource = createGenericVolumeTestResource(driver, l.config, pattern) l.resource = createGenericVolumeTestResource(driver, l.config, pattern)
@ -125,9 +125,9 @@ func (t *volumeIOTestSuite) defineTests(driver TestDriver, pattern testpatterns.
l.resource = nil l.resource = nil
} }
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps) validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps)

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

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

@ -98,8 +98,8 @@ func skipBlockTest(driver TestDriver) {
func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) {
type local struct { type local struct {
config *PerTestConfig config *PerTestConfig
testCleanup func() driverCleanup func()
resource *genericVolumeTestResource resource *genericVolumeTestResource
@ -121,7 +121,7 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
l = local{} l = local{}
// Now do the more expensive test initialization. // 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) l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
l.resource = createGenericVolumeTestResource(driver, l.config, pattern) l.resource = createGenericVolumeTestResource(driver, l.config, pattern)
if l.resource.volSource == nil { if l.resource.volSource == nil {
@ -135,9 +135,9 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
l.resource = nil l.resource = nil
} }
if l.testCleanup != nil { if l.driverCleanup != nil {
l.testCleanup() l.driverCleanup()
l.testCleanup = nil l.driverCleanup = nil
} }
validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps) validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps)