Merge pull request #3494 from aledbf/remove-503

Since dynamic mode only checking for 'return 503' is not valid anymore
kubernetes · Nov 30, 2018 · 50b552d · 50b552d
2 parents eaa91b0 + 334c382
commit 50b552d
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 32 deletions.
diff --git 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
@@ -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().
@@ -275,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)