From c16416d6b4111dca6de52827086c2e07b1adfda1 Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Fri, 24 Jun 2016 13:54:05 -0700 Subject: [PATCH] fg --- test/e2e/federated-service.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/e2e/federated-service.go b/test/e2e/federated-service.go index e53f40a8ea5..5e90611b089 100644 --- a/test/e2e/federated-service.go +++ b/test/e2e/federated-service.go @@ -146,8 +146,14 @@ var _ = framework.KubeDescribe("[Feature:Federation] Federated Services", func() AfterEach(func() { framework.SkipUnlessFederated(f.Client) + // TODO(mml): replace with calls to framework.DeleteNamespaces and + // framework.WaitForNamespacesDeleted. But first we need to re-write + // them to expect versioned clients. + // ALSO TODO(mml): Utility functions like these should [optionally?] + // accept a list of clients/clusters to act upon, to increase + // re-usablity. for i, cs := range clusterClientSets { - if err := cs.Core().Namespaces().Delete(f.Namespace.Name, &api.DeleteOptions{}); err != nil { + if err := cs.Core().Namespaces().Delete(f.Namespace.Name, api.NewDeleteOptions(0)); err != nil { framework.Failf("Couldn't delete the namespace %s in cluster [%d]: %v", f.Namespace.Name, i, err) } framework.Logf("Namespace %s deleted in cluster [%d]", f.Namespace.Name, i)