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

Fix test assertion

Browse source
This commit is contained in:
Ricardo Katz 2024-11-13 06:39:58 -07:00
parent 65c047c3cb
commit bc232c355e
4 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/e2e/lua/dynamic_configuration.go
View file

@ -212,7 +212,8 @@ func createIngress(f *framework.Framework, host, deploymentName string) {
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", host)) && return (strings.Contains(server, fmt.Sprintf("server_name %s;", host)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", host))) &&
strings.Contains(server, "proxy_pass http://upstream_balancer;") strings.Contains(server, "proxy_pass http://upstream_balancer;")
}) })
} }

3
test/e2e/metrics/metrics.go
View file

@ -43,7 +43,8 @@ var _ = framework.IngressNginxDescribe("[metrics] exported prometheus metrics",
f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)) f.EnsureIngress(framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil))
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", host)) && return (strings.Contains(server, fmt.Sprintf("server_name %s;", host)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", host))) &&
strings.Contains(server, "proxy_pass http://upstream_balancer;") strings.Contains(server, "proxy_pass http://upstream_balancer;")
}) })
}) })

12
test/e2e/settings/badannotationvalues.go
View file

@ -50,7 +50,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
!strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
}) })
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
@ -87,7 +88,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
!strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
}) })
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
@ -123,7 +125,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {
f.WaitForNginxServer(hostValid, f.WaitForNginxServer(hostValid,
func(server string) bool { func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", hostValid)) return strings.Contains(server, fmt.Sprintf("server_name %s;", hostValid)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", hostValid))
}) })
f.WaitForNginxServer(hostValid, f.WaitForNginxServer(hostValid,
@ -156,7 +159,8 @@ var _ = framework.DescribeAnnotation("Bad annotation values", func() {
f.WaitForNginxServer(host, f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) return !strings.Contains(server, fmt.Sprintf("server_name %s;", host)) &&
!strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
}) })
f.WaitForNginxServer(host, f.WaitForNginxServer(host,

3
test/e2e/settings/limit_rate.go
View file

@ -41,7 +41,8 @@ var _ = framework.DescribeSetting("Configmap - limit-rate", func() {
f.EnsureIngress(ing) f.EnsureIngress(ing)
f.WaitForNginxServer(host, func(server string) bool { f.WaitForNginxServer(host, func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %s;", host)) return strings.Contains(server, fmt.Sprintf("server_name %s;", host)) ||
strings.Contains(server, fmt.Sprintf("server_name %s ;", host))
}) })
wlKey := "limit-rate" wlKey := "limit-rate"