github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed error message reporting for Gluster driver tests

Browse Source
This commit is contained in:
David Zhu
2018-09-06 16:40:59 -07:00
parent e5f55dd9d0
commit face1ead9c
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/storage/drivers/in_tree.go
View File

@@ -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)
}
}