DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Alter e2e test for disable_catch_all.go

Browse source
This commit is contained in:
Mahnoor Mehboob 2021-04-22 12:01:41 -04:00
parent cc4d5f2283
commit 2503b23b09
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/e2e/settings/disable_catch_all.go
View file

@ -48,7 +48,7 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-catch-all", func() {
assert.Nil(ginkgo.GinkgoT(), err, "updating ingress controller deployment flags")
})
ginkgo.It("should ignore catch all Ingress", func() {
ginkgo.It("should ignore catch all Ingress with backend", func() {
host := "foo"
ing := framework.NewSingleCatchAllIngress("catch-all", f.Namespace, framework.EchoService, 80, nil)
@ -67,6 +67,18 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-catch-all", func() {
})
})
ginkgo.It("should ignore catch all Ingress with backend and rules", func() {
host := "foo"
ing := framework.NewSingleIngressWithBackendAndRules(host, "/", host, f.Namespace, framework.EchoService, 80, framework.EchoService, 80, nil)
f.EnsureIngress(ing)
f.WaitForNginxServer("_", func(cfg string) bool {
return strings.Contains(cfg, `set $ingress_name ""`) &&
strings.Contains(cfg, `set $proxy_upstream_name "upstream-default-backend"`)
})
})
ginkgo.It("should delete Ingress updated to catch-all", func() {
host := "foo"
@ -105,10 +117,10 @@ var _ = framework.IngressNginxDescribe("[Flag] disable-catch-all", func() {
Status(http.StatusNotFound)
})
ginkgo.It("should allow Ingress with both a default backend and rules", func() {
ginkgo.It("should allow Ingress with rules", func() {
host := "foo"
ing := framework.NewSingleIngressWithBackendAndRules("not-catch-all", "/rulepath", host, f.Namespace, framework.EchoService, 80, framework.EchoService, 80, nil)
ing := framework.NewSingleIngress("not-catch-all", "/", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing)
f.WaitForNginxServer(host, func(cfg string) bool {