From 576baa8d90cd620191f1511715736b6468d3b9cc Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Thu, 26 Jul 2018 23:04:31 -0400 Subject: [PATCH] improve annotations/default_backend e2e test --- test/e2e/annotations/default_backend.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/test/e2e/annotations/default_backend.go b/test/e2e/annotations/default_backend.go index 05fcc807c..443ffda33 100644 --- a/test/e2e/annotations/default_backend.go +++ b/test/e2e/annotations/default_backend.go @@ -18,10 +18,12 @@ package annotations import ( "fmt" + "net/http" "time" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/parnurzeal/gorequest" "k8s.io/ingress-nginx/test/e2e/framework" ) @@ -49,10 +51,23 @@ var _ = framework.IngressNginxDescribe("Annotations - custom default-backend", f err = f.WaitForNginxServer(host, func(server string) bool { - return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) && - Expect(server).Should(ContainSubstring("proxy_pass http://custom-default-backend")) + return Expect(server).Should(ContainSubstring(fmt.Sprintf("server_name %v", host))) }) Expect(err).NotTo(HaveOccurred()) + + uri := "/alma/armud" + resp, body, errs := gorequest.New(). + Get(f.IngressController.HTTPURL+uri). + Set("Host", host). + End() + + Expect(len(errs)).Should(BeNumerically("==", 0)) + Expect(resp.StatusCode).Should(Equal(http.StatusOK)) + + Expect(body).To(ContainSubstring("x-code=503")) + Expect(body).To(ContainSubstring(fmt.Sprintf("x-ingress-name=%s", host))) + Expect(body).To(ContainSubstring("x-service-name=invalid")) + Expect(body).To(ContainSubstring(fmt.Sprintf("x-original-uri=%s", uri))) }) }) })