From 898f618275ba45d4328df0eea1b56d26613b1c92 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Wed, 21 Sep 2016 00:09:13 -0700 Subject: [PATCH] Minor Ingress tests cleanup, that includes service shard and GCE resource cleanups in underlying clusters. --- test/e2e/federated-ingress.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/e2e/federated-ingress.go b/test/e2e/federated-ingress.go index d151831fc5f..03bb5651459 100644 --- a/test/e2e/federated-ingress.go +++ b/test/e2e/federated-ingress.go @@ -51,7 +51,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func( // Create/delete ingress api objects // Validate federation apiserver, does not rely on underlying clusters or federation ingress controller. - Describe("Ingress objects", func() { + Describe("Federated Ingresses", func() { AfterEach(func() { nsName := f.FederationNamespace.Name // Delete registered ingresses. @@ -137,6 +137,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func( deleteBackendPodsOrFail(clusters, ns) if service != nil { deleteServiceOrFail(f.FederationClientset_1_4, ns, service.Name) + cleanupServiceShardsAndProviderResources(ns, service, clusters) service = nil } else { By("No service to delete. Service is nil") @@ -164,6 +165,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func( } // TODO check dns record in global dns server }) + It("should be able to connect to a federated ingress via its load balancer", func() { // check the traffic on federation ingress jig.waitForFederatedIngress()