From 0ebaae88b14a5cca15de2e5f67647b0a1a708b77 Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Wed, 3 Jun 2020 20:15:15 +0000 Subject: [PATCH] Replace framework.Failf with ExpectNoError --- test/e2e/storage/volume_provisioning.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go index 61ca473860d..a8b494eb3ac 100644 --- a/test/e2e/storage/volume_provisioning.go +++ b/test/e2e/storage/volume_provisioning.go @@ -673,10 +673,10 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() { // Modifying the default storage class can be disruptive to other tests that depend on it ginkgo.It("should be disabled by changing the default annotation [Serial] [Disruptive]", func() { e2eskipper.SkipUnlessProviderIs("openstack", "gce", "aws", "gke", "vsphere", "azure") + scName, scErr := e2epv.GetDefaultStorageClassName(c) - if scErr != nil { - framework.Failf(scErr.Error()) - } + framework.ExpectNoError(scErr) + test := testsuites.StorageClassTest{ Name: "default", ClaimSize: "2Gi", @@ -710,10 +710,10 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() { // Modifying the default storage class can be disruptive to other tests that depend on it ginkgo.It("should be disabled by removing the default annotation [Serial] [Disruptive]", func() { e2eskipper.SkipUnlessProviderIs("openstack", "gce", "aws", "gke", "vsphere", "azure") + scName, scErr := e2epv.GetDefaultStorageClassName(c) - if scErr != nil { - framework.Failf(scErr.Error()) - } + framework.ExpectNoError(scErr) + test := testsuites.StorageClassTest{ Name: "default", ClaimSize: "2Gi",