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

Improve speed of e2e tests

Browse source
This commit is contained in:
Manuel de Brito Fontes 2018-04-19 23:14:30 -03:00
parent 10fc2548b4
commit 42e0c0abf7
No known key found for this signature in database
GPG key ID: 786136016A8BA02A
7 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -32,3 +32,4 @@ Session.vim
e2e-tests e2e-tests
coverage.txt coverage.txt
test/e2e/e2e\.test

5
.travis.yml
View file

@ -47,11 +47,12 @@ jobs:
# start minikube # start minikube
- test/e2e/up.sh - test/e2e/up.sh
script: script:
- if ! go get github.com/jteeuwen/go-bindata/...; then github.com/jteeuwen/go-bindata/...;fi - go get github.com/jteeuwen/go-bindata/...
- make cover - make cover
- stage: e2e - stage: e2e
before_script: before_script:
- if ! go get github.com/jteeuwen/go-bindata/...; then github.com/jteeuwen/go-bindata/...;fi - go get github.com/jteeuwen/go-bindata/...
- go get github.com/onsi/ginkgo/ginkgo
- make e2e-image - make e2e-image
- test/e2e/up.sh - test/e2e/up.sh
script: script:

4
Makefile
View file

@ -158,8 +158,8 @@ e2e-image: sub-container-amd64
.PHONY: e2e-test .PHONY: e2e-test
e2e-test: e2e-test:
@go test -o e2e-tests -c ./test/e2e @ginkgo build ./test/e2e
@KUBECONFIG=${HOME}/.kube/config ./e2e-tests -alsologtostderr -test.v -logtostderr -ginkgo.trace @KUBECONFIG=${HOME}/.kube/config ginkgo -randomizeSuites -randomizeAllSpecs -flakeAttempts=2 -p -trace -nodes=2 ./test/e2e/e2e.test
.PHONY: cover .PHONY: cover
cover: cover:

2
test/e2e/framework/exec.go
View file

@ -55,7 +55,7 @@ func (f *Framework) NewIngressController(namespace string) error {
execErr bytes.Buffer execErr bytes.Buffer
) )
cmd := exec.Command("test/e2e/wait-for-nginx.sh", namespace) cmd := exec.Command("./wait-for-nginx.sh", namespace)
cmd.Stdout = &execOut cmd.Stdout = &execOut
cmd.Stderr = &execErr cmd.Stderr = &execErr

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

@ -237,12 +237,12 @@ func (f *Framework) matchNginxConditions(name string, matcher func(cfg string) b
} }
var pod *v1.Pod var pod *v1.Pod
Loop:
for _, p := range l.Items { for _, p := range l.Items {
if strings.HasPrefix(p.GetName(), "nginx-ingress-controller") { if strings.HasPrefix(p.GetName(), "nginx-ingress-controller") {
if isRunning, err := podRunningReady(&p); err == nil && isRunning { if isRunning, err := podRunningReady(&p); err == nil && isRunning {
pod = &p pod = &p
break Loop break
} }
} }
} }

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

@ -52,7 +52,7 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(ing).NotTo(BeNil()) Expect(ing).NotTo(BeNil())
time.Sleep(5 * time.Second) time.Sleep(10 * time.Second)
err = f.WaitForNginxServer(host, err = f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {

1
test/manifests/ingress-controller/with-rbac.yaml
View file

@ -24,6 +24,7 @@ spec:
- --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
- --udp-services-configmap=$(POD_NAMESPACE)/udp-services - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
- --annotations-prefix=nginx.ingress.kubernetes.io - --annotations-prefix=nginx.ingress.kubernetes.io
- --watch-namespace=$(POD_NAMESPACE)
env: env:
- name: POD_NAME - name: POD_NAME
valueFrom: valueFrom: