Commit face1ead authored by David Zhu's avatar David Zhu

Fixed error message reporting for Gluster driver tests

parent e5f55dd9
...@@ -278,17 +278,14 @@ func (g *glusterFSDriver) DeleteVolume(volType testpatterns.TestVolType) { ...@@ -278,17 +278,14 @@ func (g *glusterFSDriver) DeleteVolume(volType testpatterns.TestVolType) {
name := g.driverInfo.Config.Prefix + "-server" name := g.driverInfo.Config.Prefix + "-server"
framework.Logf("Deleting Gluster endpoints %q...", name) 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) framework.Logf("Deleting Gluster server pod %q...", g.serverPod.Name)
err := framework.DeletePodWithWait(f, cs, g.serverPod) err = framework.DeletePodWithWait(f, cs, g.serverPod)
if epErr != nil || err != nil { if err != nil {
if epErr != nil { framework.Failf("Gluster server pod delete failed: %v", err)
framework.Logf("Gluster delete endpoints failed: %v", err)
}
if err != nil {
framework.Logf("Gluster server pod delete failed: %v", err)
}
framework.Failf("Cleanup failed")
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment