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

Fix e2e test error

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-09-29 08:14:24 -03:00
parent 65978ae7f2
commit 2af627f0fe
1 changed files with 10 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
test/e2e/annotations/disableaccesslog.go
View file

@ -33,49 +33,25 @@ var _ = framework.DescribeAnnotation("disable-access-log disable-http-access-log
ginkgo.It("disable-access-log set access_log off", func() { ginkgo.It("disable-access-log set access_log off", func() {
host := "disableaccesslog.foo.com" host := "disableaccesslog.foo.com"
annotations := map[string]string{
"nginx.ingress.kubernetes.io/disable-access-log": "true",
}
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations) f.UpdateNginxConfigMapData("disable-access-log", "true")
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing) f.EnsureIngress(ing)
f.WaitForNginxServer(host, f.WaitForNginxConfiguration(func(ngx string) bool {
func(server string) bool { return strings.Contains(ngx, `access_log off;`)
str := ` })
multiline
string.`
return strings.Contains(server, `access_log off;`)
})
}) })
ginkgo.It("disable-http-access-log set access_log off", func() { ginkgo.It("disable-http-access-log set access_log off", func() {
host := "disablehttpaccesslog.foo.com" host := "disablehttpaccesslog.foo.com"
annotations := map[string]string{
"nginx.ingress.kubernetes.io/disable-http-access-log": "true",
}
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations) f.UpdateNginxConfigMapData("disable-http-access-log", "true")
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
f.EnsureIngress(ing) f.EnsureIngress(ing)
f.WaitForNginxServer(host, f.WaitForNginxConfiguration(func(ngx string) bool {
func(server string) bool { return strings.Contains(ngx, `access_log off;`)
return strings.Contains(server, `access_log off;`) })
})
})
ginkgo.It("disable-stream-access-log set access_log off", func() {
host := "disablehttpaccesslog.foo.com"
annotations := map[string]string{
"nginx.ingress.kubernetes.io/disable-stream-access-log": "true",
}
ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, annotations)
f.EnsureIngress(ing)
f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, `access_log off;`)
})
}) })
}) })