Improve speed of e2e tests

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

View file

@ -55,7 +55,7 @@ func (f *Framework) NewIngressController(namespace string) error {
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.Stderr = &execErr

View file

@ -237,12 +237,12 @@ 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") {
if isRunning, err := podRunningReady(&p); err == nil && isRunning {
pod = &p
break Loop
break
}
}
}

View file

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

View file

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