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

Clenup tests

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-01-23 20:37:47 -03:00 committed by Manuel Alejandro de Brito Fontes
parent 12ec0475c0
commit 62622f6516
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,12 +27,14 @@ import (
restclient "k8s.io/client-go/rest"
"github.com/golang/glog"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
const (
podName = "test-ingress-controller"
podName = "test-ingress-controller"
controllerPodName = "nginx-ingress-controller"
)
const (
@ -225,12 +227,15 @@ func (f *Framework) matchNginxConditions(name string, matcher func(cfg string) b
}
var pod *v1.Pod
Loop:
for _, p := range l.Items {
if strings.HasPrefix(p.GetName(), "nginx-ingress-controller") &&
len(p.Status.ContainerStatuses) > 0 &&
p.Status.ContainerStatuses[0].State.Running != nil {
pod = &p
break
if strings.HasPrefix(p.GetName(), "nginx-ingress-controller") {
for _, cs := range p.Status.ContainerStatuses {
if cs.State.Running != nil && cs.Name == "nginx-ingress-controller" {
pod = &p
break Loop
}
}
}
}

11
test/e2e/settings/proxy_protocol.go
View file

@ -21,6 +21,7 @@ import (
"io/ioutil"
"net"
"strings"
"time"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
@ -35,20 +36,21 @@ import (
var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
f := framework.NewDefaultFramework("proxy-protocol")
setting := "use-proxy-protocol"
BeforeEach(func() {
err := f.NewEchoDeployment()
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
updateConfigmap(setting, "false", f.KubeClientSet)
})
It("should respect port passed by the PROXY Protocol", func() {
host := "proxy-protocol"
setting := "use-proxy-protocol"
updateConfigmap(setting, "true", f.KubeClientSet)
defer updateConfigmap(setting, "false", f.KubeClientSet)
ing, err := f.EnsureIngress(&v1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{
@ -120,11 +122,8 @@ func updateConfigmap(k, v string, c kubernetes.Interface) {
config.Data = map[string]string{}
}
if config.Data[k] == v {
return
}
config.Data[k] = v
_, err = c.CoreV1().ConfigMaps("ingress-nginx").Update(config)
Expect(err).NotTo(HaveOccurred())
time.Sleep(1 * time.Second)
}

6
test/e2e/settings/server_tokens.go
View file

@ -30,6 +30,7 @@ import (
var _ = framework.IngressNginxDescribe("Server Tokens", func() {
f := framework.NewDefaultFramework("server-tokens")
serverTokens := "server-tokens"
BeforeEach(func() {
err := f.NewEchoDeployment()
@ -37,12 +38,11 @@ var _ = framework.IngressNginxDescribe("Server Tokens", func() {
})
AfterEach(func() {
updateConfigmap(serverTokens, "false", f.KubeClientSet)
})
It("should not exists Server header in the response", func() {
serverTokens := "server-tokens"
updateConfigmap(serverTokens, "false", f.KubeClientSet)
defer updateConfigmap(serverTokens, "false", f.KubeClientSet)
ing, err := f.EnsureIngress(&v1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{
@ -84,9 +84,7 @@ var _ = framework.IngressNginxDescribe("Server Tokens", func() {
})
It("should exists Server header in the response when is enabled", func() {
serverTokens := "server-tokens"
updateConfigmap(serverTokens, "true", f.KubeClientSet)
defer updateConfigmap(serverTokens, "false", f.KubeClientSet)
ing, err := f.EnsureIngress(&v1beta1.Ingress{
ObjectMeta: metav1.ObjectMeta{