From face1ead9ce590d1c2e5727a0644438f19a11dea Mon Sep 17 00:00:00 2001 From: David Zhu Date: Thu, 6 Sep 2018 16:40:59 -0700 Subject: [PATCH] Fixed error message reporting for Gluster driver tests --- test/e2e/storage/drivers/in_tree.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go index 79c05868401..5b5a9de2df4 100644 --- a/test/e2e/storage/drivers/in_tree.go +++ b/test/e2e/storage/drivers/in_tree.go @@ -278,17 +278,14 @@ func (g *glusterFSDriver) DeleteVolume(volType testpatterns.TestVolType) { name := g.driverInfo.Config.Prefix + "-server" framework.Logf("Deleting Gluster endpoints %q...", name) - epErr := cs.CoreV1().Endpoints(ns.Name).Delete(name, nil) + err := cs.CoreV1().Endpoints(ns.Name).Delete(name, nil) + if err != nil { + framework.Failf("Gluster delete endpoints failed: %v", err) + } framework.Logf("Deleting Gluster server pod %q...", g.serverPod.Name) - err := framework.DeletePodWithWait(f, cs, g.serverPod) - if epErr != nil || err != nil { - if epErr != nil { - framework.Logf("Gluster delete endpoints failed: %v", err) - } - if err != nil { - framework.Logf("Gluster server pod delete failed: %v", err) - } - framework.Failf("Cleanup failed") + err = framework.DeletePodWithWait(f, cs, g.serverPod) + if err != nil { + framework.Failf("Gluster server pod delete failed: %v", err) } }