Merge pull request #68385 from davidz627/fix/GlusterSubpath

Automatic merge from submit-queue (batch tested with PRs 68341, 68385). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md. Fixed error message reporting for Gluster driver tests Quick fix for error message for Gluster driver tests. This doesn't solve the problem but will make it easier to pinpoint the issue if it flakes again on CI. Related to: #68373 /sig storage /kind bug /assign @msau42 ```release-note NONE ```

Merge pull request #68385 from davidz627/fix/GlusterSubpath
26403b75 · Kubernetes Submit Queue · GitHub · 0a486de9 · face1ead · 26403b75
Unverified Commit 26403b75 authored Sep 07, 2018 by Kubernetes Submit Queue Committed by GitHub Sep 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 10 deletions

in_tree.go test/e2e/storage/drivers/in_tree.go +7 -10

No files found.
--- 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)
 	}
 }