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

Improve e2e checks

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-11-22 10:54:44 -03:00
parent 51da945af5
commit b6dfe3d54d
3 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/e2e/annotations/alias.go
View file

@ -19,7 +19,6 @@ package annotations
import (
"fmt"
"net/http"
"strings"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@ -78,8 +77,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name foo") &&
!strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())
@ -139,8 +138,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name foo") &&
!strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name foo")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())

25
test/e2e/annotations/auth.go
View file

@ -20,7 +20,6 @@ import (
"fmt"
"net/http"
"os/exec"
"strings"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@ -54,8 +53,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name auth") &&
!strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())
@ -83,8 +82,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name auth") &&
strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).Should(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())
@ -117,8 +116,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name auth") &&
!strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())
@ -151,8 +150,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name auth") &&
!strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())
@ -186,8 +185,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name auth") &&
!strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())
@ -232,8 +231,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
err = f.WaitForNginxServer(host,
func(server string) bool {
return strings.Contains(server, "server_name auth") &&
!strings.Contains(server, "return 503")
return Expect(server).Should(ContainSubstring("server_name auth")) &&
Expect(server).ShouldNot(ContainSubstring("return 503"))
})
Expect(err).NotTo(HaveOccurred())

12
test/e2e/framework/framework.go
View file

@ -26,6 +26,7 @@ import (
"k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"github.com/golang/glog"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
@ -215,7 +216,16 @@ func (f *Framework) matchNginxConditions(name string, matcher func(cfg string) b
return false, err
}
if matcher(o) {
var match bool
errs := InterceptGomegaFailures(func() {
if matcher(o) {
match = true
}
})
glog.V(2).Infof("Errors waiting for conditions: %v", errs)
if match {
return true, nil
}