hs-test: transition to ginkgo test framework

[vpp.git] / extras / hs-test / suite_ns_test.go

diff --git a/extras/hs-test/suite_ns_test.go b/extras/hs-test/suite_ns_test.go
index 46d5bef..86d9b78 100644 (file)
--- a/extras/hs-test/suite_ns_test.go
+++ b/extras/hs-test/suite_ns_test.go
@@ -1,15 +1,35 @@
 package main
 
+import (
+       "fmt"
+       "reflect"
+       "runtime"
+       "strings"
+       "time"
+
+       . "github.com/onsi/ginkgo/v2"
+)
+
 // These correspond to names used in yaml config
 const (
        clientInterface = "hclnvpp"
        serverInterface = "hsrvvpp"
 )
 
+var nsTests = []func(s *NsSuite){}
+var nsSoloTests = []func(s *NsSuite){}
+
 type NsSuite struct {
        HstSuite
 }
 
+func registerNsTests(tests ...func(s *NsSuite)) {
+       nsTests = append(nsTests, tests...)
+}
+func registerNsSoloTests(tests ...func(s *NsSuite)) {
+       nsSoloTests = append(nsSoloTests, tests...)
+}
+
 func (s *NsSuite) SetupSuite() {
        s.HstSuite.SetupSuite()
        s.configureNetworkTopology("ns")
@@ -34,12 +54,62 @@ func (s *NsSuite) SetupTest() {
        s.assertNil(vpp.start())
 
        idx, err := vpp.createAfPacket(s.getInterfaceByName(serverInterface))
-       s.assertNil(err, err)
+       s.assertNil(err, fmt.Sprint(err))
        s.assertNotEqual(0, idx)
 
        idx, err = vpp.createAfPacket(s.getInterfaceByName(clientInterface))
-       s.assertNil(err, err)
+       s.assertNil(err, fmt.Sprint(err))
        s.assertNotEqual(0, idx)
 
        container.exec("chmod 777 -R %s", container.getContainerWorkDir())
 }
+
+var _ = Describe("NsSuite", Ordered, ContinueOnFailure, func() {
+       var s NsSuite
+       BeforeAll(func() {
+               s.SetupSuite()
+       })
+       BeforeEach(func() {
+               s.SetupTest()
+       })
+       AfterAll(func() {
+               s.TearDownSuite()
+       })
+       AfterEach(func() {
+               s.TearDownTest()
+       })
+
+       for _, test := range nsTests {
+               test := test
+               pc := reflect.ValueOf(test).Pointer()
+               funcValue := runtime.FuncForPC(pc)
+               It(strings.Split(funcValue.Name(), ".")[2], func(ctx SpecContext) {
+                       test(&s)
+               }, SpecTimeout(time.Minute*5))
+       }
+})
+
+var _ = Describe("NsSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+       var s NsSuite
+       BeforeAll(func() {
+               s.SetupSuite()
+       })
+       BeforeEach(func() {
+               s.SetupTest()
+       })
+       AfterAll(func() {
+               s.TearDownSuite()
+       })
+       AfterEach(func() {
+               s.TearDownTest()
+       })
+
+       for _, test := range nsSoloTests {
+               test := test
+               pc := reflect.ValueOf(test).Pointer()
+               funcValue := runtime.FuncForPC(pc)
+               It(strings.Split(funcValue.Name(), ".")[2], Label("SOLO"), func(ctx SpecContext) {
+                       test(&s)
+               }, SpecTimeout(time.Minute*5))
+       }
+})