diff --git a/test/e2e/storage/utils/utils.go b/test/e2e/storage/utils/utils.go index fac42ba9159..c6cd4e8a3b0 100644 --- a/test/e2e/storage/utils/utils.go +++ b/test/e2e/storage/utils/utils.go @@ -220,13 +220,13 @@ func TestVolumeUnmountsFromDeletedPodWithForceOption(c clientset.Interface, f *f Expect(result.Code).To(BeZero(), fmt.Sprintf("Expected grep exit code of 0, got %d", result.Code)) } + // This command is to make sure kubelet is started after test finishes no matter it fails or not. + defer func() { + KubeletCommand(KStart, c, clientPod) + }() By("Stopping the kubelet.") KubeletCommand(KStop, c, clientPod) - defer func() { - if err != nil { - KubeletCommand(KStart, c, clientPod) - } - }() + By(fmt.Sprintf("Deleting Pod %q", clientPod.Name)) if forceDelete { err = c.CoreV1().Pods(clientPod.Namespace).Delete(clientPod.Name, metav1.NewDeleteOptions(0))