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

Remove unused variables and verbose e2e logs

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-06-27 11:57:00 -04:00
parent 47b5e20a88
commit 10dcf0db15
35 changed files with 331 additions and 427 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,6 @@ import (
"net/http"
"reflect"
"strings"
"time"
"github.com/onsi/ginkgo"
"github.com/stretchr/testify/assert"
@ -104,7 +103,7 @@ var _ = framework.DescribeAnnotation("affinitymode", func() {
replicas = replicas + 1
err := framework.UpdateDeployment(f.KubeClientSet, f.Namespace, deploymentName, replicas, nil)
assert.Nil(ginkgo.GinkgoT(), err)
time.Sleep(3 * time.Second)
framework.Sleep()
response = request.WithCookies(cookies).Expect()
newHostName := getHostnameFromResponseBody(response.Body().Raw())
assert.Equal(ginkgo.GinkgoT(), originalHostName, newHostName,
@ -116,7 +115,7 @@ var _ = framework.DescribeAnnotation("affinitymode", func() {
replicas = 0
err := framework.UpdateDeployment(f.KubeClientSet, f.Namespace, deploymentName, replicas, nil)
assert.Nil(ginkgo.GinkgoT(), err)
time.Sleep(5 * time.Second)
framework.Sleep()
// validate, there is no backend to serve the request
response = request.WithCookies(cookies).Expect().Status(http.StatusServiceUnavailable)
@ -125,13 +124,13 @@ var _ = framework.DescribeAnnotation("affinitymode", func() {
replicas = 2
err = framework.UpdateDeployment(f.KubeClientSet, f.Namespace, deploymentName, replicas, nil)
assert.Nil(ginkgo.GinkgoT(), err)
time.Sleep(5 * time.Second)
framework.Sleep()
// wait brand new backends to spawn
response = request.WithCookies(cookies).Expect()
try := 0
for (response.Raw().StatusCode == http.StatusServiceUnavailable) && (try < 30) {
time.Sleep(5 * time.Second)
framework.Sleep()
response = request.WithCookies(cookies).Expect()
try++
}