Skip to content

Commit b886385

Browse files
bjee19bjee19
committed
Refactor ginkgo test specs
1 parent 7c08bcb commit b886385

File tree

1 file changed

+90
-87
lines changed

1 file changed

+90
-87
lines changed

‎tests/suite/reconfig_test.go

Lines changed: 90 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -440,115 +440,118 @@ var _ = Describe("Reconfiguration Performance Testing", Ordered, Label("reconfig
440440
Expect(err).ToNot(HaveOccurred())
441441
}
442442

443-
// Test 1 - Resources exist before start-up
444-
It("test 1 - 30 resources", func() {
445-
resourceCount := 30
446-
timeToReadyStartingLogSubstring := "Starting NGINX Gateway Fabric"
447-
test := createResourcesGWLast(resourceCount)
448-
449-
Expect(test).To(Succeed())
450-
Expect(checkResourceCreation(resourceCount)).To(Succeed())
451-
452-
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
453-
454-
collectMetrics("1",
455-
resourceCount,
456-
timeToReadyStartingLogSubstring,
457-
ngfPodName,
458-
startTime,
459-
)
460-
})
443+
When("resources exist before startup", func() {
444+
It("gathers metrics after creating 30 resources", func() {
445+
resourceCount := 30
446+
timeToReadyStartingLogSubstring := "Starting NGINX Gateway Fabric"
447+
test := createResourcesGWLast(resourceCount)
448+
449+
Expect(test).To(Succeed())
450+
Expect(checkResourceCreation(resourceCount)).To(Succeed())
451+
452+
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
453+
454+
collectMetrics("1",
455+
resourceCount,
456+
timeToReadyStartingLogSubstring,
457+
ngfPodName,
458+
startTime,
459+
)
460+
})
461461

462-
It("test 1 - 150 resources", func() {
463-
resourceCount := 150
464-
timeToReadyStartingLogSubstring := "Starting NGINX Gateway Fabric"
465-
test := createResourcesGWLast(resourceCount)
462+
It("gathers metrics after creating 150 resources", func() {
463+
resourceCount := 150
464+
timeToReadyStartingLogSubstring := "Starting NGINX Gateway Fabric"
465+
test := createResourcesGWLast(resourceCount)
466466

467-
Expect(test).To(Succeed())
468-
Expect(checkResourceCreation(resourceCount)).To(Succeed())
467+
Expect(test).To(Succeed())
468+
Expect(checkResourceCreation(resourceCount)).To(Succeed())
469469

470-
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
470+
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
471471

472-
collectMetrics("1",
473-
resourceCount,
474-
timeToReadyStartingLogSubstring,
475-
ngfPodName,
476-
startTime,
477-
)
472+
collectMetrics("1",
473+
resourceCount,
474+
timeToReadyStartingLogSubstring,
475+
ngfPodName,
476+
startTime,
477+
)
478+
})
478479
})
479480

480-
// Test 2 - Start NGF, deploy Gateway, create many resources attached to GW
481-
It("test 2 - 30 resources", func() {
482-
resourceCount := 30
483-
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"httproute\""
484-
test := createResourcesRoutesLast(resourceCount)
481+
When("NGF and Gateway resource are deployed first", func() {
482+
It("gathers metrics after creating 30 resources", func() {
483+
resourceCount := 30
484+
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"httproute\""
485+
test := createResourcesRoutesLast(resourceCount)
485486

486-
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
487+
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
487488

488-
Expect(test).To(Succeed())
489-
Expect(checkResourceCreation(resourceCount)).To(Succeed())
489+
Expect(test).To(Succeed())
490+
Expect(checkResourceCreation(resourceCount)).To(Succeed())
490491

491-
collectMetrics("2",
492-
resourceCount,
493-
timeToReadyStartingLogSubstring,
494-
ngfPodName,
495-
startTime,
496-
)
497-
})
492+
collectMetrics("2",
493+
resourceCount,
494+
timeToReadyStartingLogSubstring,
495+
ngfPodName,
496+
startTime,
497+
)
498+
})
498499

499-
It("test 2 - 150 resources", func() {
500-
resourceCount := 150
501-
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"httproute\""
502-
test := createResourcesRoutesLast(resourceCount)
500+
It("gathers metrics after creating 150 resources", func() {
501+
resourceCount := 150
502+
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"httproute\""
503+
test := createResourcesRoutesLast(resourceCount)
503504

504-
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
505+
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
505506

506-
Expect(test).To(Succeed())
507-
Expect(checkResourceCreation(resourceCount)).To(Succeed())
507+
Expect(test).To(Succeed())
508+
Expect(checkResourceCreation(resourceCount)).To(Succeed())
508509

509-
collectMetrics("2",
510-
resourceCount,
511-
timeToReadyStartingLogSubstring,
512-
ngfPodName,
513-
startTime,
514-
)
510+
collectMetrics("2",
511+
resourceCount,
512+
timeToReadyStartingLogSubstring,
513+
ngfPodName,
514+
startTime,
515+
)
516+
})
515517
})
516518

517-
// Test 3 - Start NGF, create many resources attached to a Gateway, deploy the Gateway
518-
It("test 3 - 30 resources", func() {
519-
resourceCount := 30
520-
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"gateway\""
521-
test := createResourcesGWLast(resourceCount)
519+
When("NGF and resources are deployed first", func() {
520+
It("gathers metrics after creating 30 resources", func() {
521+
resourceCount := 30
522+
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"gateway\""
523+
test := createResourcesGWLast(resourceCount)
522524

523-
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
525+
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
524526

525-
Expect(test).To(Succeed())
526-
Expect(checkResourceCreation(resourceCount)).To(Succeed())
527+
Expect(test).To(Succeed())
528+
Expect(checkResourceCreation(resourceCount)).To(Succeed())
527529

528-
collectMetrics("3",
529-
resourceCount,
530-
timeToReadyStartingLogSubstring,
531-
ngfPodName,
532-
startTime,
533-
)
534-
})
530+
collectMetrics("3",
531+
resourceCount,
532+
timeToReadyStartingLogSubstring,
533+
ngfPodName,
534+
startTime,
535+
)
536+
})
535537

536-
It("test 3 - 150 resources", func() {
537-
resourceCount := 30
538-
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"gateway\""
539-
test := createResourcesGWLast(resourceCount)
538+
It("gathers metrics after creating 150 resources", func() {
539+
resourceCount := 150
540+
timeToReadyStartingLogSubstring := "Reconciling the resource\",\"controller\":\"gateway\""
541+
test := createResourcesGWLast(resourceCount)
540542

541-
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
543+
ngfPodName, startTime := deployNGFReturnsNGFPodNameAndStartTime()
542544

543-
Expect(test).To(Succeed())
544-
Expect(checkResourceCreation(resourceCount)).To(Succeed())
545+
Expect(test).To(Succeed())
546+
Expect(checkResourceCreation(resourceCount)).To(Succeed())
545547

546-
collectMetrics("3",
547-
resourceCount,
548-
timeToReadyStartingLogSubstring,
549-
ngfPodName,
550-
startTime,
551-
)
548+
collectMetrics("3",
549+
resourceCount,
550+
timeToReadyStartingLogSubstring,
551+
ngfPodName,
552+
startTime,
553+
)
554+
})
552555
})
553556

554557
AfterEach(func() {

0 commit comments

Comments
 (0)