From 2f71c12add0b7b09f905b49fe0e2c0b734deca73 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Fri, 30 Nov 2018 09:37:48 -0300 Subject: [PATCH 1/2] Since dynamic mode only checking for 'return 503' is not valid anymore --- test/e2e/annotations/alias.go | 6 ++---- test/e2e/annotations/auth.go | 20 +++++++------------- test/e2e/annotations/canary.go | 12 ++++-------- test/e2e/annotations/grpc.go | 3 +-- test/e2e/annotations/influxdb.go | 3 +-- test/e2e/annotations/luarestywaf.go | 3 +-- 6 files changed, 16 insertions(+), 31 deletions(-) diff --git a/test/e2e/annotations/alias.go b/test/e2e/annotations/alias.go index a37026b4b..f15db1253 100644 --- a/test/e2e/annotations/alias.go +++ b/test/e2e/annotations/alias.go @@ -46,8 +46,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name foo")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name foo")) }) resp, body, errs := gorequest.New(). @@ -80,8 +79,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name foo")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name foo")) }) hosts := []string{"foo", "bar"} diff --git a/test/e2e/annotations/auth.go b/test/e2e/annotations/auth.go index fdc6a59c4..a00bd422a 100644 --- a/test/e2e/annotations/auth.go +++ b/test/e2e/annotations/auth.go @@ -53,8 +53,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name auth")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name auth")) }) resp, body, errs := gorequest.New(). @@ -81,8 +80,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name auth")) && - Expect(server).Should(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name auth")) }) resp, body, errs := gorequest.New(). @@ -112,8 +110,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name auth")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name auth")) }) resp, body, errs := gorequest.New(). @@ -143,8 +140,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name auth")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name auth")) }) resp, body, errs := gorequest.New(). @@ -175,8 +171,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name auth")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name auth")) }) resp, _, errs := gorequest.New(). @@ -218,8 +213,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name auth")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name auth")) }) resp, _, errs := gorequest.New(). @@ -300,7 +294,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.EnsureIngress(ing) f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name auth")) }) }) diff --git a/test/e2e/annotations/canary.go b/test/e2e/annotations/canary.go index 4c2d5e056..67fab180d 100644 --- a/test/e2e/annotations/canary.go +++ b/test/e2e/annotations/canary.go @@ -53,8 +53,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name foo")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name foo")) }) canaryAnnotations := map[string]string{ @@ -90,8 +89,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name foo")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name foo")) }) canaryAnnotations := map[string]string{ @@ -129,8 +127,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name foo")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name foo")) }) canaryAnnotations := map[string]string{ @@ -168,8 +165,7 @@ var _ = framework.IngressNginxDescribe("Annotations - canary", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring("server_name foo")) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring("server_name foo")) }) canaryAnnotations := map[string]string{ diff --git a/test/e2e/annotations/grpc.go b/test/e2e/annotations/grpc.go index 38ae3dc92..b3c317cab 100644 --- a/test/e2e/annotations/grpc.go +++ b/test/e2e/annotations/grpc.go @@ -45,8 +45,7 @@ var _ = framework.IngressNginxDescribe("Annotations - grpc", func() { f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) }) f.WaitForNginxServer(host, diff --git a/test/e2e/annotations/influxdb.go b/test/e2e/annotations/influxdb.go index 45c1957d0..efd572c31 100644 --- a/test/e2e/annotations/influxdb.go +++ b/test/e2e/annotations/influxdb.go @@ -128,8 +128,7 @@ func createInfluxDBIngress(f *framework.Framework, host, service string, port in f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) }) } diff --git a/test/e2e/annotations/luarestywaf.go b/test/e2e/annotations/luarestywaf.go index 0b95fb6e8..b4c2dcbdd 100644 --- a/test/e2e/annotations/luarestywaf.go +++ b/test/e2e/annotations/luarestywaf.go @@ -208,8 +208,7 @@ func createIngress(f *framework.Framework, host, service string, port int, annot f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) && - Expect(server).ShouldNot(ContainSubstring("return 503")) + return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) }) time.Sleep(1 * time.Second) From 334c38255d861bf7e452c5d637be671373510075 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Fri, 30 Nov 2018 10:18:52 -0300 Subject: [PATCH 2/2] Fix flaky auth test --- test/e2e/annotations/auth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/annotations/auth.go b/test/e2e/annotations/auth.go index a00bd422a..a70ff7450 100644 --- a/test/e2e/annotations/auth.go +++ b/test/e2e/annotations/auth.go @@ -269,7 +269,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Auth", func() { f.NewHttpbinDeployment() var httpbinIP string - err := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) { + err := wait.PollImmediate(framework.Poll, 5*time.Minute, func() (bool, error) { e, err := f.KubeClientSet.CoreV1().Endpoints(f.IngressController.Namespace).Get("httpbin", metav1.GetOptions{}) if errors.IsNotFound(err) { return false, nil