Fix scalability test suite

This commit is contained in:
Wojciech Tyczynski 2015-09-02 10:09:44 +02:00
parent d23d083439
commit 4d702d2fd5

View File

@ -1484,19 +1484,19 @@ func DeleteRC(c *client.Client, ns, name string) error {
return nil
}
deleteRCTime := time.Now().Sub(startTime)
Logf("Deleting RC took: %v", deleteRCTime)
Logf("Deleting RC %s took: %v", name, deleteRCTime)
if err == nil {
err = waitForRCPodsGone(c, rc)
}
terminatePodTime := time.Now().Sub(startTime) - deleteRCTime
Logf("Terminating RC pods took: %v", terminatePodTime)
Logf("Terminating RC %s pods took: %v", name, terminatePodTime)
return err
}
// waitForRCPodsGone waits until there are no pods reported under an RC's selector (because the pods
// have completed termination).
func waitForRCPodsGone(c *client.Client, rc *api.ReplicationController) error {
return wait.Poll(poll, singleCallTimeout, func() (bool, error) {
return wait.Poll(poll, 2*time.Minute, func() (bool, error) {
if pods, err := c.Pods(rc.Namespace).List(labels.SelectorFromSet(rc.Spec.Selector), fields.Everything()); err == nil && len(pods.Items) == 0 {
return true, nil
}