Merge pull request #46746 from verult/gce-pdflake

Added API node ready check after PD test deleting a GCE instance.
This commit is contained in:
Dawn Chen 2017-06-01 11:39:41 -07:00 committed by GitHub
commit 5943e83417

View File

@ -43,7 +43,7 @@ import (
const ( const (
gcePDDetachTimeout = 10 * time.Minute gcePDDetachTimeout = 10 * time.Minute
gcePDDetachPollTime = 10 * time.Second gcePDDetachPollTime = 10 * time.Second
nodeStatusTimeout = 1 * time.Minute nodeStatusTimeout = 3 * time.Minute
nodeStatusPollTime = 1 * time.Second nodeStatusPollTime = 1 * time.Second
maxReadRetry = 3 maxReadRetry = 3
) )
@ -428,6 +428,8 @@ var _ = framework.KubeDescribe("Pod Disks", func() {
By("Cleaning up PD-RW test env") By("Cleaning up PD-RW test env")
podClient.Delete(host0Pod.Name, metav1.NewDeleteOptions(0)) podClient.Delete(host0Pod.Name, metav1.NewDeleteOptions(0))
detachAndDeletePDs(diskName, []types.NodeName{host0Name}) detachAndDeletePDs(diskName, []types.NodeName{host0Name})
framework.WaitForNodeToBeReady(f.ClientSet, string(host0Name), nodeStatusTimeout)
Expect(len(nodes.Items)).To(Equal(initialGroupSize))
}() }()
By("submitting host0Pod to kubernetes") By("submitting host0Pod to kubernetes")