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

shave off some more seconds

Browse source
This commit is contained in:
Elvin Efendi 2018-04-20 22:38:25 -04:00
parent b2084c057d
commit 84385a01bb
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,6 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
ing, err := ensureIngress(f, host) ing, err := ensureIngress(f, host)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
Expect(ing).NotTo(BeNil()) Expect(ing).NotTo(BeNil())
time.Sleep(5 * time.Second)
err = f.WaitForNginxServer(host, err = f.WaitForNginxServer(host,
func(server string) bool { func(server string) bool {
@ -59,6 +58,9 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
// give some time for Lua to sync the backend
time.Sleep(2 * time.Second)
resp, _, errs := gorequest.New(). resp, _, errs := gorequest.New().
Get(f.IngressController.HTTPURL). Get(f.IngressController.HTTPURL).
Set("Host", host). Set("Host", host).
@ -160,7 +162,14 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
_, err = f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.IngressController.Namespace).Update(ingress) _, err = f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.IngressController.Namespace).Update(ingress)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
time.Sleep(5 * time.Second) By("generating the respective ssl listen directive")
err = f.WaitForNginxServer("foo.com",
func(server string) bool {
return strings.Contains(server, "server_name foo.com") &&
strings.Contains(server, "listen 443")
})
Expect(err).ToNot(HaveOccurred())
log, err := f.NginxLogs() log, err := f.NginxLogs()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(log).ToNot(BeEmpty()) Expect(log).ToNot(BeEmpty())
@ -177,14 +186,6 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
return strings.Contains(server, "proxy_pass http://upstream_balancer;") return strings.Contains(server, "proxy_pass http://upstream_balancer;")
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("generating the respective ssl listen directive")
err = f.WaitForNginxServer("foo.com",
func(server string) bool {
return strings.Contains(server, "server_name foo.com") &&
strings.Contains(server, "listen 443")
})
Expect(err).ToNot(HaveOccurred())
}) })
Context("when session affinity annotation is present", func() { Context("when session affinity annotation is present", func() {
@ -200,12 +201,10 @@ var _ = framework.IngressNginxDescribe("Dynamic Configuration", func() {
} }
_, err = f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.IngressController.Namespace).Update(ingress) _, err = f.KubeClientSet.ExtensionsV1beta1().Ingresses(f.IngressController.Namespace).Update(ingress)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
time.Sleep(5 * time.Second)
By("Increasing the number of service replicas") By("Increasing the number of service replicas")
err = framework.UpdateDeployment(f.KubeClientSet, f.IngressController.Namespace, "http-svc", 2, nil) err = framework.UpdateDeployment(f.KubeClientSet, f.IngressController.Namespace, "http-svc", 2, nil)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
By("Making a first request") By("Making a first request")