From 152def1cc3ab6ead0fd8c12d491f4dc137c46470 Mon Sep 17 00:00:00 2001 From: Derek Carr Date: Thu, 8 Jun 2017 16:38:50 -0400 Subject: [PATCH] Fix e2e ns deletion message --- test/e2e/framework/util.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 7b57ce35398..c4752201282 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -997,11 +997,11 @@ func deleteNS(c clientset.Interface, clientPool dynamic.ClientPool, namespace st if remainingContent { // pods remain if remainingPods > 0 { - // but they were all undergoing deletion (kubelet is probably culprit) - if missingTimestamp == 0 { + if missingTimestamp != 0 { + // pods remained, but were not undergoing deletion (namespace controller is probably culprit) return fmt.Errorf("namespace %v was not deleted with limit: %v, pods remaining: %v, pods missing deletion timestamp: %v", namespace, err, remainingPods, missingTimestamp) } - // pods remained, but were not undergoing deletion (namespace controller is probably culprit) + // but they were all undergoing deletion (kubelet is probably culprit, check NodeLost) return fmt.Errorf("namespace %v was not deleted with limit: %v, pods remaining: %v", namespace, err, remainingPods) } // other content remains (namespace controller is probably screwed up)