@@ -15,6 +15,7 @@ func TestDetermineUpdates(t *testing.T) {
15
15
t .Parallel ()
16
16
maxConns := 1
17
17
tests := []struct {
18
+ name string
18
19
updated []UpstreamServer
19
20
nginx []UpstreamServer
20
21
expectedToAdd []UpstreamServer
@@ -58,6 +59,7 @@ func TestDetermineUpdates(t *testing.T) {
58
59
Server : "10.0.0.2:80" ,
59
60
},
60
61
},
62
+ name : "replace all" ,
61
63
},
62
64
{
63
65
updated : []UpstreamServer {
@@ -96,6 +98,7 @@ func TestDetermineUpdates(t *testing.T) {
96
98
Server : "10.0.0.1:80" ,
97
99
},
98
100
},
101
+ name : "add and delete" ,
99
102
},
100
103
{
101
104
updated : []UpstreamServer {
@@ -120,6 +123,7 @@ func TestDetermineUpdates(t *testing.T) {
120
123
Server : "10.0.0.3:80" ,
121
124
},
122
125
},
126
+ name : "same" ,
123
127
},
124
128
{
125
129
// empty values
@@ -154,21 +158,26 @@ func TestDetermineUpdates(t *testing.T) {
154
158
MaxConns : & maxConns ,
155
159
},
156
160
},
161
+ name : "update field and delete" ,
157
162
},
158
163
}
159
164
160
165
for _ , test := range tests {
161
- toAdd , toDelete , toUpdate := determineUpdates (test .updated , test .nginx )
162
- if ! reflect .DeepEqual (toAdd , test .expectedToAdd ) || ! reflect .DeepEqual (toDelete , test .expectedToDelete ) || ! reflect .DeepEqual (toUpdate , test .expectedToUpdate ) {
163
- t .Errorf ("determineUpdates(%v, %v) = (%v, %v, %v)" , test .updated , test .nginx , toAdd , toDelete , toUpdate )
164
- }
166
+ t .Run (test .name , func (t * testing.T ) {
167
+ t .Parallel ()
168
+ toAdd , toDelete , toUpdate := determineUpdates (test .updated , test .nginx )
169
+ if ! reflect .DeepEqual (toAdd , test .expectedToAdd ) || ! reflect .DeepEqual (toDelete , test .expectedToDelete ) || ! reflect .DeepEqual (toUpdate , test .expectedToUpdate ) {
170
+ t .Errorf ("determineUpdates(%v, %v) = (%v, %v, %v)" , test .updated , test .nginx , toAdd , toDelete , toUpdate )
171
+ }
172
+ })
165
173
}
166
174
}
167
175
168
176
func TestStreamDetermineUpdates (t * testing.T ) {
169
177
t .Parallel ()
170
178
maxConns := 1
171
179
tests := []struct {
180
+ name string
172
181
updated []StreamUpstreamServer
173
182
nginx []StreamUpstreamServer
174
183
expectedToAdd []StreamUpstreamServer
@@ -212,6 +221,7 @@ func TestStreamDetermineUpdates(t *testing.T) {
212
221
Server : "10.0.0.2:80" ,
213
222
},
214
223
},
224
+ name : "replace all" ,
215
225
},
216
226
{
217
227
updated : []StreamUpstreamServer {
@@ -250,6 +260,7 @@ func TestStreamDetermineUpdates(t *testing.T) {
250
260
Server : "10.0.0.1:80" ,
251
261
},
252
262
},
263
+ name : "add and delete" ,
253
264
},
254
265
{
255
266
updated : []StreamUpstreamServer {
@@ -277,6 +288,7 @@ func TestStreamDetermineUpdates(t *testing.T) {
277
288
Server : "10.0.0.3:80" ,
278
289
},
279
290
},
291
+ name : "same" ,
280
292
},
281
293
{
282
294
// empty values
@@ -311,14 +323,18 @@ func TestStreamDetermineUpdates(t *testing.T) {
311
323
MaxConns : & maxConns ,
312
324
},
313
325
},
326
+ name : "update field and delete" ,
314
327
},
315
328
}
316
329
317
330
for _ , test := range tests {
318
- toAdd , toDelete , toUpdate := determineStreamUpdates (test .updated , test .nginx )
319
- if ! reflect .DeepEqual (toAdd , test .expectedToAdd ) || ! reflect .DeepEqual (toDelete , test .expectedToDelete ) || ! reflect .DeepEqual (toUpdate , test .expectedToUpdate ) {
320
- t .Errorf ("determiteUpdates(%v, %v) = (%v, %v, %v)" , test .updated , test .nginx , toAdd , toDelete , toUpdate )
321
- }
331
+ t .Run (test .name , func (t * testing.T ) {
332
+ t .Parallel ()
333
+ toAdd , toDelete , toUpdate := determineStreamUpdates (test .updated , test .nginx )
334
+ if ! reflect .DeepEqual (toAdd , test .expectedToAdd ) || ! reflect .DeepEqual (toDelete , test .expectedToDelete ) || ! reflect .DeepEqual (toUpdate , test .expectedToUpdate ) {
335
+ t .Errorf ("determiteUpdates(%v, %v) = (%v, %v, %v)" , test .updated , test .nginx , toAdd , toDelete , toUpdate )
336
+ }
337
+ })
322
338
}
323
339
}
324
340
@@ -368,16 +384,20 @@ func TestAddPortToServer(t *testing.T) {
368
384
}
369
385
370
386
for _ , test := range tests {
371
- result := addPortToServer (test .address )
372
- if result != test .expected {
373
- t .Errorf ("addPortToServer(%v) returned %v but expected %v for %v" , test .address , result , test .expected , test .msg )
374
- }
387
+ t .Run (test .msg , func (t * testing.T ) {
388
+ t .Parallel ()
389
+ result := addPortToServer (test .address )
390
+ if result != test .expected {
391
+ t .Errorf ("addPortToServer(%v) returned %v but expected %v for %v" , test .address , result , test .expected , test .msg )
392
+ }
393
+ })
375
394
}
376
395
}
377
396
378
397
func TestHaveSameParameters (t * testing.T ) {
379
398
t .Parallel ()
380
399
tests := []struct {
400
+ msg string
381
401
server UpstreamServer
382
402
serverNGX UpstreamServer
383
403
expected bool
@@ -386,11 +406,13 @@ func TestHaveSameParameters(t *testing.T) {
386
406
server : UpstreamServer {},
387
407
serverNGX : UpstreamServer {},
388
408
expected : true ,
409
+ msg : "empty" ,
389
410
},
390
411
{
391
412
server : UpstreamServer {ID : 2 },
392
413
serverNGX : UpstreamServer {ID : 3 },
393
414
expected : true ,
415
+ msg : "different ID" ,
394
416
},
395
417
{
396
418
server : UpstreamServer {},
@@ -404,6 +426,7 @@ func TestHaveSameParameters(t *testing.T) {
404
426
Down : & defaultDown ,
405
427
},
406
428
expected : true ,
429
+ msg : "default values" ,
407
430
},
408
431
{
409
432
server : UpstreamServer {
@@ -429,35 +452,43 @@ func TestHaveSameParameters(t *testing.T) {
429
452
Down : & defaultDown ,
430
453
},
431
454
expected : true ,
455
+ msg : "same values" ,
432
456
},
433
457
{
434
458
server : UpstreamServer {SlowStart : "10s" },
435
459
serverNGX : UpstreamServer {},
436
460
expected : false ,
461
+ msg : "different SlowStart" ,
437
462
},
438
463
{
439
464
server : UpstreamServer {},
440
465
serverNGX : UpstreamServer {SlowStart : "10s" },
441
466
expected : false ,
467
+ msg : "different SlowStart 2" ,
442
468
},
443
469
{
444
470
server : UpstreamServer {SlowStart : "20s" },
445
471
serverNGX : UpstreamServer {SlowStart : "10s" },
446
472
expected : false ,
473
+ msg : "different SlowStart 3" ,
447
474
},
448
475
}
449
476
450
477
for _ , test := range tests {
451
- result := haveSameParameters (test .server , test .serverNGX )
452
- if result != test .expected {
453
- t .Errorf ("haveSameParameters(%v, %v) returned %v but expected %v" , test .server , test .serverNGX , result , test .expected )
454
- }
478
+ t .Run (test .msg , func (t * testing.T ) {
479
+ t .Parallel ()
480
+ result := haveSameParameters (test .server , test .serverNGX )
481
+ if result != test .expected {
482
+ t .Errorf ("haveSameParameters(%v, %v) returned %v but expected %v" , test .server , test .serverNGX , result , test .expected )
483
+ }
484
+ })
455
485
}
456
486
}
457
487
458
488
func TestHaveSameParametersForStream (t * testing.T ) {
459
489
t .Parallel ()
460
490
tests := []struct {
491
+ msg string
461
492
server StreamUpstreamServer
462
493
serverNGX StreamUpstreamServer
463
494
expected bool
@@ -466,11 +497,13 @@ func TestHaveSameParametersForStream(t *testing.T) {
466
497
server : StreamUpstreamServer {},
467
498
serverNGX : StreamUpstreamServer {},
468
499
expected : true ,
500
+ msg : "empty" ,
469
501
},
470
502
{
471
503
server : StreamUpstreamServer {ID : 2 },
472
504
serverNGX : StreamUpstreamServer {ID : 3 },
473
505
expected : true ,
506
+ msg : "different ID" ,
474
507
},
475
508
{
476
509
server : StreamUpstreamServer {},
@@ -484,6 +517,7 @@ func TestHaveSameParametersForStream(t *testing.T) {
484
517
Down : & defaultDown ,
485
518
},
486
519
expected : true ,
520
+ msg : "default values" ,
487
521
},
488
522
{
489
523
server : StreamUpstreamServer {
@@ -509,24 +543,30 @@ func TestHaveSameParametersForStream(t *testing.T) {
509
543
Down : & defaultDown ,
510
544
},
511
545
expected : true ,
546
+ msg : "same values" ,
512
547
},
513
548
{
514
549
server : StreamUpstreamServer {},
515
550
serverNGX : StreamUpstreamServer {SlowStart : "10s" },
516
551
expected : false ,
552
+ msg : "different SlowStart" ,
517
553
},
518
554
{
519
555
server : StreamUpstreamServer {SlowStart : "20s" },
520
556
serverNGX : StreamUpstreamServer {SlowStart : "10s" },
521
557
expected : false ,
558
+ msg : "different SlowStart 2" ,
522
559
},
523
560
}
524
561
525
562
for _ , test := range tests {
526
- result := haveSameParametersForStream (test .server , test .serverNGX )
527
- if result != test .expected {
528
- t .Errorf ("haveSameParametersForStream(%v, %v) returned %v but expected %v" , test .server , test .serverNGX , result , test .expected )
529
- }
563
+ t .Run (test .msg , func (t * testing.T ) {
564
+ t .Parallel ()
565
+ result := haveSameParametersForStream (test .server , test .serverNGX )
566
+ if result != test .expected {
567
+ t .Errorf ("haveSameParametersForStream(%v, %v) returned %v but expected %v" , test .server , test .serverNGX , result , test .expected )
568
+ }
569
+ })
530
570
}
531
571
}
532
572
@@ -624,6 +664,7 @@ func TestClientWithHTTPClient(t *testing.T) {
624
664
}
625
665
626
666
func TestGetStats_NoStreamEndpoint (t * testing.T ) {
667
+ t .Parallel ()
627
668
tests := []struct {
628
669
ctx context.Context
629
670
name string
@@ -641,7 +682,6 @@ func TestGetStats_NoStreamEndpoint(t *testing.T) {
641
682
var client * NginxClient
642
683
var writeLock sync.Mutex
643
684
644
- t .Parallel ()
645
685
ts := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
646
686
writeLock .Lock ()
647
687
defer writeLock .Unlock ()
@@ -708,6 +748,7 @@ func TestGetStats_NoStreamEndpoint(t *testing.T) {
708
748
}
709
749
710
750
func TestGetStats_SSL (t * testing.T ) {
751
+ t .Parallel ()
711
752
tests := []struct {
712
753
ctx context.Context
713
754
name string
@@ -722,7 +763,6 @@ func TestGetStats_SSL(t *testing.T) {
722
763
},
723
764
}
724
765
725
- t .Parallel ()
726
766
ts := httptest .NewServer (http .HandlerFunc (func (w http.ResponseWriter , r * http.Request ) {
727
767
switch {
728
768
case r .RequestURI == "/" :
0 commit comments