Merge pull request #12901 from piosz/deleting-ns-fix

Increased timeout while waiting for namespace deletion
This commit is contained in:
Piotr Szczesniak 2015-08-19 11:45:53 +02:00
commit f7116392cf
3 changed files with 3 additions and 3 deletions

View File

@ -141,7 +141,7 @@ var _ = Describe("Density", func() {
}
By(fmt.Sprintf("Destroying namespace for this suite %v", ns))
if err := deleteNS(c, ns); err != nil {
if err := c.Namespaces().Delete(ns); err != nil {
Failf("Couldn't delete ns %s", err)
}

View File

@ -81,7 +81,7 @@ var _ = Describe("Load capacity", func() {
deleteAllRC(configs)
By(fmt.Sprintf("Destroying namespace for this suite %v", ns))
if err := deleteNS(c, ns); err != nil {
if err := c.Namespaces().Delete(ns); err != nil {
Failf("Couldn't delete ns %s", err)
}

View File

@ -526,7 +526,7 @@ func deleteNS(c *client.Client, namespace string) error {
return err
}
err := wait.Poll(1*time.Second, 2*time.Minute, func() (bool, error) {
err := wait.Poll(5*time.Second, 5*time.Minute, func() (bool, error) {
if _, err := c.Namespaces().Get(namespace); err != nil {
if apierrs.IsNotFound(err) {
return true, nil