From 41b8fdcd767b715cfb32e079ca8ca87e17c7566b Mon Sep 17 00:00:00 2001 From: Piotr Szczesniak Date: Wed, 19 Aug 2015 11:16:24 +0200 Subject: [PATCH] Increased timeout while waiting for namespace deletion Removed waiting for namespace to be deleted in Density and Load e2e tests --- test/e2e/density.go | 2 +- test/e2e/load.go | 2 +- test/e2e/util.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/density.go b/test/e2e/density.go index 62ccb822de5..c2fc23761b4 100644 --- a/test/e2e/density.go +++ b/test/e2e/density.go @@ -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) } diff --git a/test/e2e/load.go b/test/e2e/load.go index d1797a775d9..41dddbc51c8 100644 --- a/test/e2e/load.go +++ b/test/e2e/load.go @@ -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) } diff --git a/test/e2e/util.go b/test/e2e/util.go index 15d210bfde2..e4e9200746b 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -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