Since dynamic mode only checking for 'return 503' is not valid anymore

This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-11-30 09:37:48 -03:00
parent eaa91b0f0f
commit 2f71c12add
6 changed files with 16 additions and 31 deletions

View file

@ -53,8 +53,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -81,8 +80,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).Should(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -112,8 +110,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -143,8 +140,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, body, errs := gorequest.New().
@ -175,8 +171,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, _, errs := gorequest.New().
@ -218,8 +213,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.WaitForNginxServer(host,
func(server string) bool {
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
resp, _, errs := gorequest.New().
@ -300,7 +294,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() {
f.EnsureIngress(ing)
f.WaitForNginxServer(host, func(server string) bool {
return Expect(server).ShouldNot(ContainSubstring("return 503"))
return Expect(server).Should(ContainSubstring("server_name auth"))
})
})