Skip to content

Commit f3143d9

Browse files
mavriqmavriq
committed
tuned one of tests
1 parent ef03036 commit f3143d9

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

‎test/e2e/annotations/canary.go‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
5757

5858
f.WaitForNginxServer(host,
5959
func(server string) bool {
60-
return strings.Contains(server, "server_name foo")
60+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
6161
})
6262

6363
canaryAnnotations := map[string]string{
@@ -105,6 +105,11 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
105105
80,
106106
canaryAnnotations))
107107

108+
f.WaitForNginxServer(host,
109+
func(server string) bool {
110+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
111+
})
112+
108113
f.HTTPTestClient().
109114
GET("/info").
110115
WithHeader("Host", host).
@@ -126,7 +131,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
126131
127132
f.WaitForNginxServer(host,
128133
func(server string) bool {
129-
return strings.Contains(server,"server_name foo")
134+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
130135
})
131136
132137
canaryAnnotations := map[string]string{
@@ -186,7 +191,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
186191

187192
f.WaitForNginxServer(host,
188193
func(server string) bool {
189-
return strings.Contains(server, "server_name foo")
194+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
190195
})
191196

192197
canaryAnnotations := map[string]string{
@@ -261,7 +266,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
261266

262267
f.WaitForNginxServer(host,
263268
func(server string) bool {
264-
return strings.Contains(server, "server_name foo")
269+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
265270
})
266271

267272
ginkgo.By("routing requests destined for the mainline ingress to the mainelin upstream")
@@ -301,7 +306,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
301306

302307
f.WaitForNginxServer(host,
303308
func(server string) bool {
304-
return strings.Contains(server, "server_name foo")
309+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
305310
})
306311

307312
canaryAnnotations := map[string]string{
@@ -335,7 +340,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
335340

336341
f.WaitForNginxServer(host,
337342
func(server string) bool {
338-
return strings.Contains(server, "server_name foo")
343+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
339344
})
340345

341346
ginkgo.By("routing requests destined fro the mainline ingress to the mainline upstream")
@@ -375,7 +380,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
375380

376381
f.WaitForNginxServer(host,
377382
func(server string) bool {
378-
return strings.Contains(server, "server_name foo")
383+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
379384
})
380385

381386
canaryAnnotations := map[string]string{
@@ -396,7 +401,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
396401

397402
f.WaitForNginxServer(host,
398403
func(server string) bool {
399-
return strings.Contains(server, "server_name foo")
404+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
400405
})
401406

402407
newAnnotations := map[string]string{
@@ -415,7 +420,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
415420

416421
f.WaitForNginxServer(host,
417422
func(server string) bool {
418-
return strings.Contains(server, "server_name foo")
423+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
419424
})
420425

421426
ginkgo.By("routing requests destined for the mainline ingress to the mainline upstream")
@@ -456,7 +461,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
456461

457462
f.WaitForNginxServer(host,
458463
func(server string) bool {
459-
return strings.Contains(server, "server_name foo")
464+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
460465
})
461466

462467
canaryAnnotations := map[string]string{
@@ -525,7 +530,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
525530

526531
f.WaitForNginxServer(host,
527532
func(server string) bool {
528-
return strings.Contains(server, "server_name foo")
533+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
529534
})
530535

531536
canaryAnnotations := map[string]string{
@@ -606,7 +611,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
606611

607612
f.WaitForNginxServer(host,
608613
func(server string) bool {
609-
return strings.Contains(server, "server_name foo")
614+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
610615
})
611616

612617
canaryAnnotations := map[string]string{
@@ -659,7 +664,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
659664

660665
f.WaitForNginxServer(host,
661666
func(server string) bool {
662-
return strings.Contains(server, "server_name foo")
667+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
663668
})
664669

665670
canaryAnnotations := map[string]string{
@@ -704,7 +709,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
704709

705710
f.WaitForNginxServer(host,
706711
func(server string) bool {
707-
return strings.Contains(server, "server_name foo")
712+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
708713
})
709714

710715
canaryAnnotations := map[string]string{
@@ -753,7 +758,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
753758

754759
f.WaitForNginxServer(host,
755760
func(server string) bool {
756-
return strings.Contains(server, "server_name foo")
761+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
757762
})
758763

759764
canaryAnnotations := map[string]string{
@@ -802,7 +807,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
802807

803808
f.WaitForNginxServer(host,
804809
func(server string) bool {
805-
return strings.Contains(server, "server_name foo")
810+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
806811
})
807812

808813
canaryAnnotations := map[string]string{
@@ -874,7 +879,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
874879

875880
f.WaitForNginxServer(host,
876881
func(server string) bool {
877-
return strings.Contains(server, "server_name foo")
882+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
878883
})
879884

880885
canaryIngName := fmt.Sprintf("%v-canary", host)
@@ -894,7 +899,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
894899

895900
f.WaitForNginxServer(host,
896901
func(server string) bool {
897-
return strings.Contains(server, "server_name foo")
902+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
898903
})
899904

900905
f.HTTPTestClient().
@@ -922,7 +927,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
922927

923928
f.WaitForNginxServer(host,
924929
func(server string) bool {
925-
return strings.Contains(server, "server_name foo")
930+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
926931
})
927932

928933
canaryIngName := fmt.Sprintf("%v-canary", host)
@@ -964,7 +969,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
964969

965970
f.WaitForNginxServer(host,
966971
func(server string) bool {
967-
return strings.Contains(server, "server_name foo")
972+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
968973
})
969974

970975
canaryIngName := fmt.Sprintf("%v-canary", host)
@@ -1007,7 +1012,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
10071012

10081013
f.WaitForNginxServer(host,
10091014
func(server string) bool {
1010-
return strings.Contains(server, "server_name foo")
1015+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
10111016
})
10121017

10131018
canaryIngName := fmt.Sprintf("%v-canary", host)
@@ -1043,7 +1048,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
10431048

10441049
f.WaitForNginxServer(host,
10451050
func(server string) bool {
1046-
return strings.Contains(server, "server_name foo")
1051+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
10471052
})
10481053

10491054
canaryIngName := fmt.Sprintf("%v-canary", host)
@@ -1163,7 +1168,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
11631168

11641169
f.WaitForNginxServer(host,
11651170
func(server string) bool {
1166-
return strings.Contains(server, "server_name foo")
1171+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
11671172
})
11681173
})
11691174

@@ -1189,7 +1194,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
11891194

11901195
f.WaitForNginxServer(host,
11911196
func(server string) bool {
1192-
return strings.Contains(server, "server_name foo")
1197+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
11931198
})
11941199

11951200
// Canary weight is 1% to ensure affinity cookie does its job.
@@ -1256,7 +1261,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
12561261

12571262
f.WaitForNginxServer(host,
12581263
func(server string) bool {
1259-
return strings.Contains(server, "server_name foo")
1264+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
12601265
})
12611266

12621267
// Canary weight is 1% to ensure affinity cookie does its job.
@@ -1324,7 +1329,7 @@ var _ = framework.DescribeAnnotation("canary-*", func() {
13241329

13251330
f.WaitForNginxServer(host,
13261331
func(server string) bool {
1327-
return strings.Contains(server, "server_name foo")
1332+
return strings.Contains(server, fmt.Sprintf("server_name %v", host))
13281333
})
13291334

13301335
// Canary weight is 50% to ensure requests are going there.

0 commit comments

Comments
 (0)