From 5c2cba391d8129dc1b389876605f1f31653c07ed Mon Sep 17 00:00:00 2001 From: Cheng Xing Date: Wed, 31 May 2017 18:38:24 -0700 Subject: [PATCH] Added API node ready check after PD test deleting a GCE instance. - Need to ensure that all nodes are ready, i.e. back to the state before the test. --- test/e2e/storage/pd.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/storage/pd.go b/test/e2e/storage/pd.go index 730ff45c5ed..d844b6038c0 100644 --- a/test/e2e/storage/pd.go +++ b/test/e2e/storage/pd.go @@ -43,7 +43,7 @@ import ( const ( gcePDDetachTimeout = 10 * time.Minute gcePDDetachPollTime = 10 * time.Second - nodeStatusTimeout = 1 * time.Minute + nodeStatusTimeout = 3 * time.Minute nodeStatusPollTime = 1 * time.Second maxReadRetry = 3 ) @@ -428,6 +428,8 @@ var _ = framework.KubeDescribe("Pod Disks", func() { By("Cleaning up PD-RW test env") podClient.Delete(host0Pod.Name, metav1.NewDeleteOptions(0)) detachAndDeletePDs(diskName, []types.NodeName{host0Name}) + framework.WaitForNodeToBeReady(f.ClientSet, string(host0Name), nodeStatusTimeout) + Expect(len(nodes.Items)).To(Equal(initialGroupSize)) }() By("submitting host0Pod to kubernetes")