From 8d3abb83f9d0bf5c9c538adefa82d08074b79980 Mon Sep 17 00:00:00 2001 From: Michelle Au Date: Mon, 9 Sep 2019 18:48:43 -0700 Subject: [PATCH] Rename testCleanup to driverCleanup Change-Id: I2ee50e2c7eed82724b7a2703819dcefcf7fa915f --- test/e2e/storage/testsuites/disruptive.go | 12 ++++++------ test/e2e/storage/testsuites/ephemeral.go | 12 ++++++------ test/e2e/storage/testsuites/multivolume.go | 12 ++++++------ test/e2e/storage/testsuites/provisioning.go | 12 ++++++------ test/e2e/storage/testsuites/snapshottable.go | 4 ++-- test/e2e/storage/testsuites/subpath.go | 12 ++++++------ test/e2e/storage/testsuites/topology.go | 10 +++++----- test/e2e/storage/testsuites/volume_expand.go | 12 ++++++------ test/e2e/storage/testsuites/volume_io.go | 12 ++++++------ test/e2e/storage/testsuites/volumemode.go | 12 ++++++------ test/e2e/storage/testsuites/volumes.go | 12 ++++++------ 11 files changed, 61 insertions(+), 61 deletions(-) diff --git a/test/e2e/storage/testsuites/disruptive.go b/test/e2e/storage/testsuites/disruptive.go index d820a3639da..7201944d8bb 100644 --- a/test/e2e/storage/testsuites/disruptive.go +++ b/test/e2e/storage/testsuites/disruptive.go @@ -61,8 +61,8 @@ func (s *disruptiveTestSuite) skipRedundantSuite(driver TestDriver, pattern test func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() cs clientset.Interface ns *v1.Namespace @@ -87,7 +87,7 @@ func (s *disruptiveTestSuite) 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) if pattern.VolMode == v1.PersistentVolumeBlock && !driver.GetDriverInfo().Capabilities[CapBlock] { 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 } - if l.testCleanup != nil { - l.testCleanup() - l.testCleanup = nil + if l.driverCleanup != nil { + l.driverCleanup() + l.driverCleanup = nil } } diff --git a/test/e2e/storage/testsuites/ephemeral.go b/test/e2e/storage/testsuites/ephemeral.go index b2a400c0fae..c1a823d486a 100644 --- a/test/e2e/storage/testsuites/ephemeral.go +++ b/test/e2e/storage/testsuites/ephemeral.go @@ -65,8 +65,8 @@ func (p *ephemeralTestSuite) skipRedundantSuite(driver TestDriver, pattern testp func (p *ephemeralTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() testCase *EphemeralTest } @@ -94,7 +94,7 @@ func (p *ephemeralTestSuite) defineTests(driver TestDriver, pattern testpatterns l = local{} // Now do the more expensive test initialization. - l.config, l.testCleanup = driver.PrepareTest(f) + l.config, l.driverCleanup = driver.PrepareTest(f) l.testCase = &EphemeralTest{ Client: l.config.Framework.ClientSet, Namespace: f.Namespace.Name, @@ -107,9 +107,9 @@ func (p *ephemeralTestSuite) defineTests(driver TestDriver, pattern testpatterns } cleanup := func() { - if l.testCleanup != nil { - l.testCleanup() - l.testCleanup = nil + if l.driverCleanup != nil { + l.driverCleanup() + l.driverCleanup = nil } } diff --git a/test/e2e/storage/testsuites/multivolume.go b/test/e2e/storage/testsuites/multivolume.go index 9a17a864e9f..4f3aae6ba2c 100644 --- a/test/e2e/storage/testsuites/multivolume.go +++ b/test/e2e/storage/testsuites/multivolume.go @@ -63,8 +63,8 @@ func (t *multiVolumeTestSuite) skipRedundantSuite(driver TestDriver, pattern tes func (t *multiVolumeTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() cs clientset.Interface ns *v1.Namespace @@ -99,7 +99,7 @@ func (t *multiVolumeTestSuite) defineTests(driver TestDriver, pattern testpatter l.driver = driver // 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) } @@ -108,9 +108,9 @@ func (t *multiVolumeTestSuite) defineTests(driver TestDriver, pattern testpatter resource.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) diff --git a/test/e2e/storage/testsuites/provisioning.go b/test/e2e/storage/testsuites/provisioning.go index 5798937d4bc..56095db8080 100644 --- a/test/e2e/storage/testsuites/provisioning.go +++ b/test/e2e/storage/testsuites/provisioning.go @@ -87,8 +87,8 @@ func (p *provisioningTestSuite) skipRedundantSuite(driver TestDriver, pattern te func (p *provisioningTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() testCase *StorageClassTest cs clientset.Interface @@ -127,7 +127,7 @@ func (p *provisioningTestSuite) defineTests(driver TestDriver, pattern testpatte l = local{} // 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.cs = l.config.Framework.ClientSet claimSize := dDriver.GetClaimSize() @@ -155,9 +155,9 @@ func (p *provisioningTestSuite) defineTests(driver TestDriver, pattern testpatte } cleanup := func() { - 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) diff --git a/test/e2e/storage/testsuites/snapshottable.go b/test/e2e/storage/testsuites/snapshottable.go index fc017a35588..638a73c82fd 100644 --- a/test/e2e/storage/testsuites/snapshottable.go +++ b/test/e2e/storage/testsuites/snapshottable.go @@ -101,8 +101,8 @@ func (s *snapshottableTestSuite) defineTests(driver TestDriver, pattern testpatt dc := f.DynamicClient // Now do the more expensive test initialization. - config, testCleanup := driver.PrepareTest(f) - defer testCleanup() + config, driverCleanup := driver.PrepareTest(f) + defer driverCleanup() vsc := sDriver.GetSnapshotClass(config) class := dDriver.GetDynamicProvisionStorageClass(config, "") diff --git a/test/e2e/storage/testsuites/subpath.go b/test/e2e/storage/testsuites/subpath.go index b2b5186fb92..4e77dcf5b59 100644 --- a/test/e2e/storage/testsuites/subpath.go +++ b/test/e2e/storage/testsuites/subpath.go @@ -81,8 +81,8 @@ func (s *subPathTestSuite) skipRedundantSuite(driver TestDriver, pattern testpat func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() resource *genericVolumeTestResource roVolSource *v1.VolumeSource @@ -109,7 +109,7 @@ func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.T l = local{} // 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.resource = createGenericVolumeTestResource(driver, l.config, pattern) @@ -165,9 +165,9 @@ func (s *subPathTestSuite) defineTests(driver TestDriver, pattern testpatterns.T l.resource = nil } - if l.testCleanup != nil { - l.testCleanup() - l.testCleanup = nil + if l.driverCleanup != nil { + l.driverCleanup() + l.driverCleanup = nil } validateMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName, l.intreeOps, l.migratedOps) diff --git a/test/e2e/storage/testsuites/topology.go b/test/e2e/storage/testsuites/topology.go index 22f93c19bf9..421dcafbec0 100644 --- a/test/e2e/storage/testsuites/topology.go +++ b/test/e2e/storage/testsuites/topology.go @@ -40,8 +40,8 @@ type topologyTestSuite struct { } type topologyTest struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() intreeOps opCounts migratedOps opCounts @@ -109,7 +109,7 @@ func (t *topologyTestSuite) defineTests(driver TestDriver, pattern testpatterns. l := topologyTest{} // Now do the more expensive test initialization. - l.config, l.testCleanup = driver.PrepareTest(f) + l.config, l.driverCleanup = driver.PrepareTest(f) l.resource = genericVolumeTestResource{ driver: driver, @@ -151,8 +151,8 @@ func (t *topologyTestSuite) defineTests(driver TestDriver, pattern testpatterns. cleanup := func(l topologyTest) { t.cleanupResources(cs, &l) - if l.testCleanup != nil { - l.testCleanup() + if l.driverCleanup != nil { + l.driverCleanup() } validateMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName, l.intreeOps, l.migratedOps) diff --git a/test/e2e/storage/testsuites/volume_expand.go b/test/e2e/storage/testsuites/volume_expand.go index fd48dc0dc4a..97ec20759c1 100644 --- a/test/e2e/storage/testsuites/volume_expand.go +++ b/test/e2e/storage/testsuites/volume_expand.go @@ -70,8 +70,8 @@ func (v *volumeExpandTestSuite) skipRedundantSuite(driver TestDriver, pattern te func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() resource *genericVolumeTestResource pod *v1.Pod @@ -102,7 +102,7 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte l = local{} // 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.resource = createGenericVolumeTestResource(driver, l.config, pattern) } @@ -127,9 +127,9 @@ func (v *volumeExpandTestSuite) defineTests(driver TestDriver, pattern testpatte l.resource = nil } - if l.testCleanup != nil { - l.testCleanup() - l.testCleanup = nil + if l.driverCleanup != nil { + l.driverCleanup() + l.driverCleanup = nil } validateMigrationVolumeOpCounts(f.ClientSet, driver.GetDriverInfo().InTreePluginName, l.intreeOps, l.migratedOps) diff --git a/test/e2e/storage/testsuites/volume_io.go b/test/e2e/storage/testsuites/volume_io.go index 71d29acfd5b..e789e1bac3c 100644 --- a/test/e2e/storage/testsuites/volume_io.go +++ b/test/e2e/storage/testsuites/volume_io.go @@ -84,8 +84,8 @@ func (t *volumeIOTestSuite) skipRedundantSuite(driver TestDriver, pattern testpa func (t *volumeIOTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() resource *genericVolumeTestResource @@ -109,7 +109,7 @@ func (t *volumeIOTestSuite) defineTests(driver TestDriver, pattern testpatterns. l = local{} // 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.resource = createGenericVolumeTestResource(driver, l.config, pattern) @@ -125,9 +125,9 @@ func (t *volumeIOTestSuite) defineTests(driver TestDriver, pattern testpatterns. l.resource = nil } - 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) diff --git a/test/e2e/storage/testsuites/volumemode.go b/test/e2e/storage/testsuites/volumemode.go index d4dbe330325..ee1a42a6624 100644 --- a/test/e2e/storage/testsuites/volumemode.go +++ b/test/e2e/storage/testsuites/volumemode.go @@ -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) diff --git a/test/e2e/storage/testsuites/volumes.go b/test/e2e/storage/testsuites/volumes.go index 67dd2b74c89..7f5fe286fdb 100644 --- a/test/e2e/storage/testsuites/volumes.go +++ b/test/e2e/storage/testsuites/volumes.go @@ -98,8 +98,8 @@ func skipBlockTest(driver TestDriver) { func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.TestPattern) { type local struct { - config *PerTestConfig - testCleanup func() + config *PerTestConfig + driverCleanup func() resource *genericVolumeTestResource @@ -121,7 +121,7 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T l = local{} // 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.resource = createGenericVolumeTestResource(driver, l.config, pattern) if l.resource.volSource == nil { @@ -135,9 +135,9 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T l.resource = nil } - 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)