From b0ab8a27cbc902c7b54ff38ca3ab3a0c8d49dc1c Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 30 Oct 2015 13:28:49 +0100 Subject: [PATCH] Add additional logs on failed cleanup. --- test/e2e/volumes.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index 517eb8b2b3c..cc0d143c94e 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -160,9 +160,18 @@ func volumeTestCleanup(client *client.Client, config VolumeTestConfig) { podClient := client.Pods(config.namespace) - // ignore all errors, the pods may not be even created - podClient.Delete(config.prefix+"-client", nil) - podClient.Delete(config.prefix+"-server", nil) + err := podClient.Delete(config.prefix+"-client", nil) + if err != nil { + // Log the error before failing test: if the test has already failed, + // expectNoError() won't print anything to logs! + glog.Warningf("Failed to delete client pod: %v", err) + expectNoError(err, "Failed to delete client pod: %v", err) + } + err = podClient.Delete(config.prefix+"-server", nil) + if err != nil { + glog.Warningf("Failed to delete server pod: %v", err) + expectNoError(err, "Failed to delete server pod: %v", err) + } } // Start a client pod using given VolumeSource (exported by startVolumeServer())