From eead54985d8ef33e168c2fd878d1e2fe65aaab74 Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Fri, 17 May 2019 16:48:58 -0700 Subject: [PATCH] CSI migration e2e: do not skip tests if metricsGrabber.HasRegisteredMaster() is true --- test/e2e/storage/testsuites/base.go | 5 +++-- test/e2e/storage/testsuites/volumes.go | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/e2e/storage/testsuites/base.go b/test/e2e/storage/testsuites/base.go index f708794356f..d16a19222e0 100644 --- a/test/e2e/storage/testsuites/base.go +++ b/test/e2e/storage/testsuites/base.go @@ -512,11 +512,12 @@ func getVolumeOpCounts(c clientset.Interface, pluginName string) opCounts { metricsGrabber, err := metrics.NewMetricsGrabber(c, nil, true, false, true, false, false) if err != nil { - framework.Failf("Error creating metrics grabber : %v", err) + framework.ExpectNoError(err, "Error creating metrics grabber: %v", err) } 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() diff --git a/test/e2e/storage/testsuites/volumes.go b/test/e2e/storage/testsuites/volumes.go index 69290a485da..99179d35e9d 100644 --- a/test/e2e/storage/testsuites/volumes.go +++ b/test/e2e/storage/testsuites/volumes.go @@ -118,12 +118,11 @@ func (t *volumesTestSuite) defineTests(driver TestDriver, pattern testpatterns.T // Now do the more expensive test initialization. l.config, l.testCleanup = driver.PrepareTest(f) + l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName) l.resource = createGenericVolumeTestResource(driver, l.config, pattern) if l.resource.volSource == nil { framework.Skipf("Driver %q does not define volumeSource - skipping", dInfo.Name) } - - l.intreeOps, l.migratedOps = getMigrationVolumeOpCounts(f.ClientSet, dInfo.InTreePluginName) } cleanup := func() {