github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78058 from verult/skip-leaking-pd

Browse Source 
CSI migration e2e: do not skip tests if metricsGrabber.HasRegisteredM…
This commit is contained in:
Kubernetes Prow Robot 2019-05-23 14:48:20 -07:00 committed by GitHub
commit 8c94f4daed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/storage/testsuites/base.go
View File

@ -512,11 +512,12 @@ func getVolumeOpCounts(c clientset.Interface, pluginName string) opCounts {
metricsGrabber, err := metrics.NewMetricsGrabber(c, nil, true, false, true, false, false) metricsGrabber, err := metrics.NewMetricsGrabber(c, nil, true, false, true, false, false)
if err != nil { if err != nil {
framework.Failf("Error creating metrics grabber : %v", err) framework.ExpectNoError(err, "Error creating metrics grabber: %v", err)
} }
if !metricsGrabber.HasRegisteredMaster() { if !metricsGrabber.HasRegisteredMaster() {
framework.Skipf("Environment does not support getting controller-manager metrics - skipping") e2elog.Logf("Warning: Environment does not support getting controller-manager metrics")
return opCounts{}
} }
controllerMetrics, err := metricsGrabber.GrabFromControllerManager() controllerMetrics, err := metricsGrabber.GrabFromControllerManager()

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

@ -118,12 +118,11 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T
// Now do the more expensive test initialization. // Now do the more expensive test initialization.
l.config, l.testCleanup = driver.PrepareTest(f) l.config, l.testCleanup = driver.PrepareTest(f)
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 {
framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name) framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name)
} }
l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName)
} }
cleanup := func() { cleanup := func() {