diff --git a/test/e2e/util.go b/test/e2e/util.go index 7230bc3c88c..8453d230f22 100644 --- a/test/e2e/util.go +++ b/test/e2e/util.go @@ -44,7 +44,6 @@ import ( "github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/GoogleCloudPlatform/kubernetes/pkg/watch" - "code.google.com/p/go-uuid/uuid" "github.com/davecgh/go-spew/spew" "golang.org/x/crypto/ssh" @@ -326,19 +325,19 @@ func waitForPersistentVolumePhase(phase api.PersistentVolumePhase, c *client.Cli func createTestingNS(baseName string, c *client.Client) (*api.Namespace, error) { namespaceObj := &api.Namespace{ ObjectMeta: api.ObjectMeta{ - Name: fmt.Sprintf("e2e-tests-%v-%v", baseName, uuid.New()), - Namespace: "", + GenerateName: fmt.Sprintf("e2e-tests-%v-", baseName), + Namespace: "", }, Status: api.NamespaceStatus{}, } - _, err := c.Namespaces().Create(namespaceObj) + got, err := c.Namespaces().Create(namespaceObj) if err != nil { - return namespaceObj, err + return got, err } - if err := waitForDefaultServiceAccountInNamespace(c, namespaceObj.Name); err != nil { - return namespaceObj, err + if err := waitForDefaultServiceAccountInNamespace(c, got.Name); err != nil { + return got, err } - return namespaceObj, nil + return got, nil } func waitForPodRunningInNamespace(c *client.Client, podName string, namespace string) error {