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

Fix wait times in e2e tests

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-08-09 08:13:24 -04:00
parent 59a7f51cd4
commit 351248fabb
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import (
"os/exec"
"regexp"
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/stretchr/testify/assert"
@ -443,7 +444,7 @@ var _ = framework.DescribeAnnotation("auth-*", func() {
err := framework.WaitForEndpoints(f.KubeClientSet, framework.DefaultTimeout, framework.HTTPBinService, f.Namespace, 1)
assert.Nil(ginkgo.GinkgoT(), err)
framework.Sleep(1)
framework.Sleep(1 * time.Second)
e, err := f.KubeClientSet.CoreV1().Endpoints(f.Namespace).Get(context.TODO(), framework.HTTPBinService, metav1.GetOptions{})
assert.Nil(ginkgo.GinkgoT(), err)

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

@ -213,6 +213,7 @@ func (f *Framework) WaitForNginxServer(name string, matcher func(cfg string) boo
func (f *Framework) WaitForNginxConfiguration(matcher func(cfg string) bool) {
err := wait.PollImmediate(Poll, DefaultTimeout, f.matchNginxConditions("", matcher))
assert.Nil(ginkgo.GinkgoT(), err, "waiting for nginx server condition/s")
Sleep(1 * time.Second)
}
// WaitForNginxCustomConfiguration waits until the nginx configuration given part (from, to) contains a particular configuration

4
test/e2e/gracefulshutdown/shutdown.go
View file

@ -97,7 +97,7 @@ var _ = framework.IngressNginxDescribe("[Shutdown] ingress controller", func() {
result <- resp.StatusCode
}()
framework.Sleep(1)
framework.Sleep(1 * time.Second)
f.ScaleDeploymentToZero("nginx-ingress-controller")
@ -142,7 +142,7 @@ var _ = framework.IngressNginxDescribe("[Shutdown] ingress controller", func() {
result <- resp.StatusCode
}()
framework.Sleep(1)
framework.Sleep(1 * time.Second)
f.ScaleDeploymentToZero("nginx-ingress-controller")