From 76a01a99d5b432c7f2dbf8a14963234dc706635a Mon Sep 17 00:00:00 2001 From: Canh Ngo Date: Wed, 22 Nov 2017 21:07:42 +0100 Subject: [PATCH] Simplify test --- test/e2e/annotations/affinity.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/e2e/annotations/affinity.go b/test/e2e/annotations/affinity.go index 823c4074b..87a8c3440 100644 --- a/test/e2e/annotations/affinity.go +++ b/test/e2e/annotations/affinity.go @@ -55,13 +55,10 @@ var _ = framework.IngressNginxDescribe("Annotations - Affinity", func() { Expect(ing).NotTo(BeNil()) stickyUpstreamName := "sticky-"+f.Namespace.Name+"-http-svc-80" - upstreamPrefix := fmt.Sprintf(` - upstream %v { - sticky hash=md5 name=SERVERID httponly;`, stickyUpstreamName) err = f.WaitForNginxServer(host, func(cfg string) bool { return strings.Contains(cfg, "proxy_pass http://"+stickyUpstreamName+";") && - strings.Contains(cfg, upstreamPrefix) + strings.Contains(cfg, "sticky hash=md5 name=SERVERID httponly;") }) Expect(err).NotTo(HaveOccurred())