Merge pull request #32539 from…

Merge pull request #32539 from quinton-hoole/2016-09-12-enable-remaining-federated-ingress-e2e-tests Automatic merge from submit-queue Re-enable Federated Ingress e2e test to check connectivity to global load balancer ...Now that it works properly. Should not merge before #31600, as it will fail until then.

Merge pull request #32539 from…
3206be19 · Kubernetes Submit Queue · GitHub · cd1ab76c · a4696bb8 · 3206be19
Commit 3206be19 authored Sep 13, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

federated-ingress.go test/e2e/federated-ingress.go +3 -2

No files found.
--- a/test/e2e/federated-ingress.go
+++ b/test/e2e/federated-ingress.go
@@ -149,7 +149,7 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
 				}
 			})

-			PIt("should be able to discover a federated ingress service", func() {
+			PIt("should be able to discover a federated ingress service via DNS", func() {
 				// we are about the ingress name
 				svcDNSNames := []string{
 					fmt.Sprintf("%s.%s", FederatedIngressServiceName, ns),
@@ -163,7 +163,8 @@ var _ = framework.KubeDescribe("Federated ingresses [Feature:Federation]", func(
 					discoverService(f, DNSName, true, "federated-ingress-e2e-discovery-pod-"+strconv.Itoa(i))
 				}
 				// 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()
 			})