From 59ee8c24eab5d2d9b102dc82ce4e3749a637d00a Mon Sep 17 00:00:00 2001
From: Satnam Singh <satnam@google.com>
Date: Wed, 24 Jun 2015 12:41:12 -0700
Subject: [PATCH] Retry namespace creation for e2e tests

---
 test/e2e/util.go | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/test/e2e/util.go b/test/e2e/util.go
index edc6f70d986..8233a24c737 100644
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -364,12 +364,21 @@ func createTestingNS(baseName string, c *client.Client) (*api.Namespace, error)
 		},
 		Status: api.NamespaceStatus{},
 	}
-	got, err := c.Namespaces().Create(namespaceObj)
-	if err != nil {
-		return got, err
+	// Be robust about making the namespace creation call.
+	var got *api.Namespace
+	if err := wait.Poll(poll, singleCallTimeout, func() (bool, error) {
+		var err error
+		got, err = c.Namespaces().Create(namespaceObj)
+		if err != nil {
+			return false, nil
+		}
+		return true, nil
+	}); err != nil {
+		return nil, err
 	}
+
 	if err := waitForDefaultServiceAccountInNamespace(c, got.Name); err != nil {
-		return got, err
+		return nil, err
 	}
 	return got, nil
 }