From b6dfe3d54dd7b69f7562311e2d5b7f70721d14bc Mon Sep 17 00:00:00 2001
From: Manuel de Brito Fontes <aledbf@gmail.com>
Date: Wed, 22 Nov 2017 10:54:44 -0300
Subject: [PATCH] Improve e2e checks

---
 test/e2e/annotations/alias.go   |  9 ++++-----
 test/e2e/annotations/auth.go    | 25 ++++++++++++-------------
 test/e2e/framework/framework.go | 12 +++++++++++-
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/test/e2e/annotations/alias.go b/test/e2e/annotations/alias.go
index 07b6f7936..b7fcc9c1e 100644
--- a/test/e2e/annotations/alias.go
+++ b/test/e2e/annotations/alias.go
@@ -19,7 +19,6 @@ package annotations
 import (
 	"fmt"
 	"net/http"
-	"strings"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -78,8 +77,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name foo") &&
-					!strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name foo")) &&
+					Expect(server).ShouldNot(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -139,8 +138,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name foo") &&
-					!strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name foo")) &&
+					Expect(server).ShouldNot(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
diff --git a/test/e2e/annotations/auth.go b/test/e2e/annotations/auth.go
index cffe270ed..dfc64e4b6 100644
--- a/test/e2e/annotations/auth.go
+++ b/test/e2e/annotations/auth.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"net/http"
 	"os/exec"
-	"strings"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -54,8 +53,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name auth") &&
-					!strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name auth")) &&
+					Expect(server).ShouldNot(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -83,8 +82,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name auth") &&
-					strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name auth")) &&
+					Expect(server).Should(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -117,8 +116,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name auth") &&
-					!strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name auth")) &&
+					Expect(server).ShouldNot(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -151,8 +150,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name auth") &&
-					!strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name auth")) &&
+					Expect(server).ShouldNot(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -186,8 +185,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name auth") &&
-					!strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name auth")) &&
+					Expect(server).ShouldNot(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
@@ -232,8 +231,8 @@ var _ = framework.IngressNginxDescribe("Annotations - Alias", func() {
 
 		err = f.WaitForNginxServer(host,
 			func(server string) bool {
-				return strings.Contains(server, "server_name auth") &&
-					!strings.Contains(server, "return 503")
+				return Expect(server).Should(ContainSubstring("server_name auth")) &&
+					Expect(server).ShouldNot(ContainSubstring("return 503"))
 			})
 		Expect(err).NotTo(HaveOccurred())
 
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 44331f239..20994decc 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	restclient "k8s.io/client-go/rest"
 
+	"github.com/golang/glog"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
@@ -215,7 +216,16 @@ func (f *Framework) matchNginxConditions(name string, matcher func(cfg string) b
 			return false, err
 		}
 
-		if matcher(o) {
+		var match bool
+		errs := InterceptGomegaFailures(func() {
+			if matcher(o) {
+				match = true
+			}
+		})
+
+		glog.V(2).Infof("Errors waiting for conditions: %v", errs)
+
+		if match {
 			return true, nil
 		}