hs-test: add suite labels and label filtering

- https://onsi.github.io/ginkgo/#spec-labels

Type: test

Change-Id: I7ebb703d52d6e65efb7a24cd3abc949a749b26c8
Signed-off-by: Adrian Villin <[email protected]>

diff --git a/test-c/hs-test/Makefile b/test-c/hs-test/Makefile
index 033d8ab..6e53f54 100644 (file)
--- a/test-c/hs-test/Makefile
+++ b/test-c/hs-test/Makefile
@@ -121,6 +121,7 @@ help:
        @echo " UNCONFIGURE=[true|false] - unconfigure selected test"
        @echo " DEBUG=[true|false]       - attach VPP to GDB"
        @echo " TEST=[name1,name2...]    - specific test(s) to run"
+       @echo " LABEL=[suite labels]     - filter by suite labels, case insensitive (https://onsi.github.io/ginkgo/#spec-labels)"
        @echo " SKIP=[name1,name2...]    - specific test(s) to skip"
        @echo " CPUS=[n]                 - number of cpus to allocate to each non-VPP container (default = 1)"
        @echo " VPP_CPUS=[n]             - number of cpus to allocate to each VPP container (default = 1)"
@@ -168,7 +169,8 @@ test: .deps.ok .build.ok
                --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
                --vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT) --cpu0=$(CPU0) \
                --dryrun=$(DRYRUN) --skip=$(SKIP) --no_color=$(NO_COLOR) --timeout=$(TIMEOUT) \
-               --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT); \
+               --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT) \
+               --label="$(LABEL)"; \
                ./script/compress.sh $$?
 
 .PHONY: test-debug
@@ -180,7 +182,8 @@ test-debug: .deps.ok .build_debug.ok
                --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST) --cpus=$(CPUS) \
                --vppsrc=$(VPPSRC) --parallel=$(PARALLEL) --repeat=$(REPEAT) --debug_build=true \
                --cpu0=$(CPU0) --dryrun=$(DRYRUN) --skip=$(SKIP) --no_color=$(NO_COLOR) --timeout=$(TIMEOUT) \
-               --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT); \
+               --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT) \
+               --label="$(LABEL)"; \
                ./script/compress.sh $$?
 
 .PHONY: wipe-lcov
@@ -195,7 +198,8 @@ test-cov: .deps.ok .build.cov.ok wipe-lcov
                .$(HS_ROOT)/hs_test.sh --coverage=true --persist=$(PERSIST) --verbose=$(VERBOSE) \
                --unconfigure=$(UNCONFIGURE) --debug=$(DEBUG) --test=$(TEST-HS) --cpus=$(CPUS) \
                --vppsrc=$(VPPSRC) --cpu0=$(CPU0) --dryrun=$(DRYRUN) --skip=$(SKIP) --no_color=$(NO_COLOR) \
-               --timeout=$(TIMEOUT) --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT); \
+               --timeout=$(TIMEOUT) --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT) \
+               --label="$(LABEL)"; \
                ./script/compress.sh $$?
        $(MAKE) -C ../.. test-cov-post-standalone HS_TEST=1
 
@@ -205,7 +209,7 @@ test-leak: .deps.ok .build_debug.ok
        docker run $(DOCKER_TTY) --rm $(DOCKER_CAPABILITIES) $(DOCKER_DEVICES) $(DOCKER_PROXY)\
                -e BUILD_NUMBER=$(BUILD_NUMBER) $(DOCKER_VOLUMES) --name ginkgo hs-test/ginkgo \
                .$(HS_ROOT)/hs_test.sh --test=$(TEST) --debug_build=true --leak_check=true --vppsrc=$(VPPSRC) --timeout=$(TIMEOUT) \
-               --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT);
+               --ginkgo_timeout=$(GINKGO_TIMEOUT) --vpp_cpus=$(VPP_CPUS) --hs_root=$(HS_ROOT) --label="$(LABEL)";
 
 # this is executed in a container by hs-test.sh
 .PHONY: build-go

diff --git a/test-c/hs-test/hs_test.sh b/test-c/hs-test/hs_test.sh
index 68fb1fd..1eddaa7 100755 (executable)
--- a/test-c/hs-test/hs_test.sh
+++ b/test-c/hs-test/hs_test.sh
@@ -15,6 +15,7 @@ skip_names=()
 dryrun=
 no_color=
 hs_root=
+label=
 
 for i in "$@"
 do
@@ -122,6 +123,12 @@ case "${i}" in
     --hs_root=*)
         hs_root="${i#*=}"
         cd $hs_root
+        ;;
+    --label=*)
+        label="${i#*=}"
+        ginkgo_args="$ginkgo_args --label-filter="$label" -v"
+        args="$args -verbose"
+        ;;
 esac
 done
 

diff --git a/test-c/hs-test/infra/suite_cpu_pinning.go b/test-c/hs-test/infra/suite_cpu_pinning.go
index bd7677d..38e928b 100644 (file)
--- a/test-c/hs-test/infra/suite_cpu_pinning.go
+++ b/test-c/hs-test/infra/suite_cpu_pinning.go
@@ -59,7 +59,7 @@ func (s *CpuPinningSuite) TeardownTest() {
        s.CpusPerContainer = *NConfiguredCpus
 }
 
-var _ = Describe("CpuPinningSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("CpuPinningSuite", Ordered, ContinueOnFailure, Label("CpuPinning"), func() {
        var s CpuPinningSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -90,7 +90,7 @@ var _ = Describe("CpuPinningSuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("CpuPinningSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("CpuPinningSuiteSolo", Ordered, ContinueOnFailure, Serial, Label("CpuPinning"), func() {
        var s CpuPinningSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -111,7 +111,7 @@ var _ = Describe("CpuPinningSuiteSolo", Ordered, ContinueOnFailure, Serial, func
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_envoy_proxy.go b/test-c/hs-test/infra/suite_envoy_proxy.go
index 9ad7b76..a29b847 100644 (file)
--- a/test-c/hs-test/infra/suite_envoy_proxy.go
+++ b/test-c/hs-test/infra/suite_envoy_proxy.go
@@ -185,7 +185,7 @@ func (s *EnvoyProxySuite) CurlUploadResource(uri, file string) {
        s.AssertNotContains(log, "Operation timed out")
 }
 
-var _ = Describe("EnvoyProxySuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("EnvoyProxySuite", Ordered, ContinueOnFailure, Label("Envoy", "Proxy", "VCL"), func() {
        var s EnvoyProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -214,7 +214,7 @@ var _ = Describe("EnvoyProxySuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("EnvoyProxySuiteSolo", Ordered, ContinueOnFailure, func() {
+var _ = Describe("EnvoyProxySuiteSolo", Ordered, ContinueOnFailure, Label("Envoy", "Proxy"), func() {
        var s EnvoyProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -235,7 +235,7 @@ var _ = Describe("EnvoyProxySuiteSolo", Ordered, ContinueOnFailure, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_hsi.go b/test-c/hs-test/infra/suite_hsi.go
index 997cdc2..968d17d 100644 (file)
--- a/test-c/hs-test/infra/suite_hsi.go
+++ b/test-c/hs-test/infra/suite_hsi.go
@@ -134,7 +134,7 @@ func (s *HsiSuite) ServerAddr() string {
        return s.Interfaces.Server.Peer.Ip4AddressString()
 }
 
-var _ = Describe("HsiSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("HsiSuite", Ordered, ContinueOnFailure, Label("HSI"), func() {
        var s HsiSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -163,7 +163,7 @@ var _ = Describe("HsiSuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("HsiSoloSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("HsiSoloSuite", Ordered, ContinueOnFailure, Serial, Label("HSI"), func() {
        var s HsiSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -184,7 +184,7 @@ var _ = Describe("HsiSoloSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -192,7 +192,7 @@ var _ = Describe("HsiSoloSuite", Ordered, ContinueOnFailure, Serial, func() {
        }
 })
 
-var _ = Describe("HsiMWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("HsiMWSuite", Ordered, ContinueOnFailure, Serial, Label("HSI", "Solo", "MW"), func() {
        var s HsiSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -213,7 +213,7 @@ var _ = Describe("HsiMWSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_http1.go b/test-c/hs-test/infra/suite_http1.go
index 0190d9f..09209b8 100644 (file)
--- a/test-c/hs-test/infra/suite_http1.go
+++ b/test-c/hs-test/infra/suite_http1.go
@@ -127,7 +127,7 @@ func (s *Http1Suite) HostAddr() string {
        return s.Interfaces.Tap.Ip4AddressString()
 }
 
-var _ = Describe("Http1Suite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("Http1Suite", Ordered, ContinueOnFailure, Label("HTTP", "HTTP1"), func() {
        var s Http1Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -156,7 +156,7 @@ var _ = Describe("Http1Suite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("Http1SuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("Http1SuiteSolo", Ordered, ContinueOnFailure, Serial, Label("HTTP", "HTTP1"), func() {
        var s Http1Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -177,7 +177,7 @@ var _ = Describe("Http1SuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -185,7 +185,7 @@ var _ = Describe("Http1SuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
        }
 })
 
-var _ = Describe("Http1MWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("Http1MWSuite", Ordered, ContinueOnFailure, Serial, Label("HTTP", "HTTP1", "MW"), func() {
        var s Http1Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -206,7 +206,7 @@ var _ = Describe("Http1MWSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_http2.go b/test-c/hs-test/infra/suite_http2.go
index 67410d6..bc72fed 100644 (file)
--- a/test-c/hs-test/infra/suite_http2.go
+++ b/test-c/hs-test/infra/suite_http2.go
@@ -138,7 +138,7 @@ func (s *Http2Suite) CreateNginxServer() {
        )
 }
 
-var _ = Describe("Http2Suite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("Http2Suite", Ordered, ContinueOnFailure, Label("HTTP", "HTTP2"), func() {
        var s Http2Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -167,7 +167,7 @@ var _ = Describe("Http2Suite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("Http2SoloSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("Http2SoloSuite", Ordered, ContinueOnFailure, Serial, Label("HTTP", "HTTP2", "Solo"), func() {
        var s Http2Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -188,7 +188,7 @@ var _ = Describe("Http2SoloSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -196,7 +196,7 @@ var _ = Describe("Http2SoloSuite", Ordered, ContinueOnFailure, Serial, func() {
        }
 })
 
-var _ = Describe("Http2MWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("Http2MWSuite", Ordered, ContinueOnFailure, Serial, Label("HTTP", "HTTP2", "MW"), func() {
        var s Http2Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -217,7 +217,7 @@ var _ = Describe("Http2MWSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -411,7 +411,7 @@ var specs = []struct {
        {ExtrasTestGroup, extrasTests},
 }
 
-var _ = Describe("H2SpecSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("H2SpecSuite", Ordered, ContinueOnFailure, Label("HTTP", "HTTP2", "H2Spec"), func() {
        var s Http2Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -498,7 +498,7 @@ func h2specdVerifyResult(s Http2Suite, nExecuted int) bool {
        return strings.Contains(string(report), expected)
 }
 
-var _ = Describe("H2SpecClientSuite", Ordered, Serial, func() {
+var _ = Describe("H2SpecClientSuite", Ordered, Serial, Label("HTTP", "HTTP2", "H2Spec", "H2SpecClient"), func() {
        var s Http2Suite
        BeforeAll(func() {
                s.SetupSuite()

diff --git a/test-c/hs-test/infra/suite_iperf_linux.go b/test-c/hs-test/infra/suite_iperf_linux.go
index e061eb2..ac89c9a 100644 (file)
--- a/test-c/hs-test/infra/suite_iperf_linux.go
+++ b/test-c/hs-test/infra/suite_iperf_linux.go
@@ -44,7 +44,7 @@ func (s *IperfSuite) SetupSuite() {
        s.Ports.Port1 = s.GeneratePort()
 }
 
-var _ = Describe("IperfSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("IperfSuite", Ordered, ContinueOnFailure, Label("Iperf", "Linux"), func() {
        var s IperfSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -73,7 +73,7 @@ var _ = Describe("IperfSuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("IperfSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("IperfSuiteSolo", Ordered, ContinueOnFailure, Serial, Label("Iperf", "Linux"), func() {
        var s IperfSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -94,7 +94,7 @@ var _ = Describe("IperfSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_ldp.go b/test-c/hs-test/infra/suite_ldp.go
index ea73efe..895dcd9 100644 (file)
--- a/test-c/hs-test/infra/suite_ldp.go
+++ b/test-c/hs-test/infra/suite_ldp.go
@@ -157,7 +157,7 @@ func (s *LdpSuite) setupClientVpp(clientContainer *Container) {
        s.AssertNotEqual(0, idx)
 }
 
-var _ = Describe("LdpSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("LdpSuite", Ordered, ContinueOnFailure, Label("LDP", "VCL"), func() {
        var s LdpSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -188,7 +188,7 @@ var _ = Describe("LdpSuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("LdpSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("LdpSuiteSolo", Ordered, ContinueOnFailure, Serial, Label("LDP", "VCL"), func() {
        var s LdpSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -210,7 +210,7 @@ var _ = Describe("LdpSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -218,7 +218,7 @@ var _ = Describe("LdpSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
        }
 })
 
-var _ = Describe("LdpMWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("LdpMWSuite", Ordered, ContinueOnFailure, Serial, Label("LDP", "VCL", "MW"), func() {
        var s LdpSuite
        BeforeAll(func() {
                s.SetupSuite()

diff --git a/test-c/hs-test/infra/suite_masque.go b/test-c/hs-test/infra/suite_masque.go
index 18d6305..f8b757c 100644 (file)
--- a/test-c/hs-test/infra/suite_masque.go
+++ b/test-c/hs-test/infra/suite_masque.go
@@ -209,7 +209,7 @@ func (s *MasqueSuite) ProxyAddr() string {
        return s.Interfaces.TunnelServer.Ip4AddressString()
 }
 
-var _ = Describe("MasqueSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("MasqueSuite", Ordered, ContinueOnFailure, Label("Masque", "Proxy", "ConnectProxy"), func() {
        var s MasqueSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -238,7 +238,7 @@ var _ = Describe("MasqueSuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("MasqueSoloSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("MasqueSoloSuite", Ordered, ContinueOnFailure, Serial, Label("Masque", "Proxy", "ConnectProxy"), func() {
        var s MasqueSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -259,7 +259,7 @@ var _ = Describe("MasqueSoloSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -267,7 +267,7 @@ var _ = Describe("MasqueSoloSuite", Ordered, ContinueOnFailure, Serial, func() {
        }
 })
 
-var _ = Describe("MasqueMWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("MasqueMWSuite", Ordered, ContinueOnFailure, Serial, Label("Masque", "Proxy", "ConnectProxy", "MW"), func() {
        var s MasqueSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -288,7 +288,7 @@ var _ = Describe("MasqueMWSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_nginx_proxy.go b/test-c/hs-test/infra/suite_nginx_proxy.go
index 2ef84e3..c2f00c5 100644 (file)
--- a/test-c/hs-test/infra/suite_nginx_proxy.go
+++ b/test-c/hs-test/infra/suite_nginx_proxy.go
@@ -197,7 +197,7 @@ func (s *NginxProxySuite) AddVclConfig(container *Container, multiThreadWorkers
        s.AssertNil(err, fmt.Sprint(err))
 }
 
-var _ = Describe("NginxProxySuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("NginxProxySuite", Ordered, ContinueOnFailure, Label("Nginx", "Proxy", "LDP", "VCL"), func() {
        var s NginxProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -226,7 +226,7 @@ var _ = Describe("NginxProxySuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("NginxProxySuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("NginxProxySuiteSolo", Ordered, ContinueOnFailure, Serial, Label("Nginx", "Proxy", "LDP", "VCL"), func() {
        var s NginxProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -247,7 +247,7 @@ var _ = Describe("NginxProxySuiteSolo", Ordered, ContinueOnFailure, Serial, func
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_no_topo.go b/test-c/hs-test/infra/suite_no_topo.go
index 787c857..a05bac8 100644 (file)
--- a/test-c/hs-test/infra/suite_no_topo.go
+++ b/test-c/hs-test/infra/suite_no_topo.go
@@ -197,7 +197,7 @@ func (s *NoTopoSuite) CreateNginxHttp3Config(container *Container) {
        )
 }
 
-var _ = Describe("NoTopoSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("NoTopoSuite", Ordered, ContinueOnFailure, Label("Generic"), func() {
        var s NoTopoSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -226,7 +226,7 @@ var _ = Describe("NoTopoSuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("NoTopoSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("NoTopoSuiteSolo", Ordered, ContinueOnFailure, Serial, Label("Generic"), func() {
        var s NoTopoSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -247,7 +247,7 @@ var _ = Describe("NoTopoSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -255,7 +255,7 @@ var _ = Describe("NoTopoSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
        }
 })
 
-var _ = Describe("NoTopoMWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("NoTopoMWSuite", Ordered, ContinueOnFailure, Serial, Label("Generic", "MW"), func() {
        var s NoTopoSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -276,7 +276,7 @@ var _ = Describe("NoTopoMWSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_no_topo6.go b/test-c/hs-test/infra/suite_no_topo6.go
index 499e970..aeb48d4 100644 (file)
--- a/test-c/hs-test/infra/suite_no_topo6.go
+++ b/test-c/hs-test/infra/suite_no_topo6.go
@@ -187,7 +187,7 @@ func (s *NoTopo6Suite) CreateNginxHttp3Config(container *Container) {
        )
 }
 
-var _ = Describe("NoTopo6Suite", Ordered, ContinueOnFailure, Label("IPv6"), func() {
+var _ = Describe("NoTopo6Suite", Ordered, ContinueOnFailure, Label("Generic", "IPv6"), func() {
        var s NoTopo6Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -216,7 +216,7 @@ var _ = Describe("NoTopo6Suite", Ordered, ContinueOnFailure, Label("IPv6"), func
        }
 })
 
-var _ = Describe("NoTopo6SuiteSolo", Ordered, ContinueOnFailure, Serial, Label("IPv6"), func() {
+var _ = Describe("NoTopo6SuiteSolo", Ordered, ContinueOnFailure, Serial, Label("Generic", "IPv6"), func() {
        var s NoTopo6Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -237,7 +237,7 @@ var _ = Describe("NoTopo6SuiteSolo", Ordered, ContinueOnFailure, Serial, Label("
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_veth.go b/test-c/hs-test/infra/suite_veth.go
index a3db5cd..24dfae2 100644 (file)
--- a/test-c/hs-test/infra/suite_veth.go
+++ b/test-c/hs-test/infra/suite_veth.go
@@ -111,7 +111,7 @@ func (s *VethsSuite) SetupClientVpp() {
        s.AssertNotEqual(0, idx)
 }
 
-var _ = Describe("VethsSuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("VethsSuite", Ordered, ContinueOnFailure, Label("Veth"), func() {
        var s VethsSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -142,7 +142,7 @@ var _ = Describe("VethsSuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("VethsSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("VethsSuiteSolo", Ordered, ContinueOnFailure, Serial, Label("Veth"), func() {
        var s VethsSuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -164,7 +164,7 @@ var _ = Describe("VethsSuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_veth6.go b/test-c/hs-test/infra/suite_veth6.go
index f3e7fda..3d1e46b 100644 (file)
--- a/test-c/hs-test/infra/suite_veth6.go
+++ b/test-c/hs-test/infra/suite_veth6.go
@@ -102,7 +102,7 @@ func (s *Veths6Suite) SetupClientVpp() {
        s.AssertNotEqual(0, idx)
 }
 
-var _ = Describe("Veths6Suite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("Veths6Suite", Ordered, ContinueOnFailure, Label("Veth", "IPv6"), func() {
        var s Veths6Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -133,7 +133,7 @@ var _ = Describe("Veths6Suite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("Veths6SuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("Veths6SuiteSolo", Ordered, ContinueOnFailure, Serial, Label("Veth", "IPv6"), func() {
        var s Veths6Suite
        BeforeAll(func() {
                s.SetupSuite()
@@ -155,7 +155,7 @@ var _ = Describe("Veths6SuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))

diff --git a/test-c/hs-test/infra/suite_vpp_proxy.go b/test-c/hs-test/infra/suite_vpp_proxy.go
index 0c7c151..ef6e08b 100644 (file)
--- a/test-c/hs-test/infra/suite_vpp_proxy.go
+++ b/test-c/hs-test/infra/suite_vpp_proxy.go
@@ -246,7 +246,7 @@ func handleConn(conn net.Conn) {
        }
 }
 
-var _ = Describe("VppProxySuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("VppProxySuite", Ordered, ContinueOnFailure, Label("VPPproxy", "Proxy"), func() {
        var s VppProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -275,7 +275,7 @@ var _ = Describe("VppProxySuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("VppProxySuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("VppProxySuiteSolo", Ordered, ContinueOnFailure, Serial, Label("VPPproxy", "Proxy"), func() {
        var s VppProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -296,7 +296,7 @@ var _ = Describe("VppProxySuiteSolo", Ordered, ContinueOnFailure, Serial, func()
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -304,7 +304,7 @@ var _ = Describe("VppProxySuiteSolo", Ordered, ContinueOnFailure, Serial, func()
        }
 })
 
-var _ = Describe("VppProxyMWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("VppProxyMWSuite", Ordered, ContinueOnFailure, Serial, Label("VPPproxy", "Proxy", "MW"), func() {
        var s VppProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -325,7 +325,7 @@ var _ = Describe("VppProxyMWSuite", Ordered, ContinueOnFailure, Serial, func() {
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -333,7 +333,7 @@ var _ = Describe("VppProxyMWSuite", Ordered, ContinueOnFailure, Serial, func() {
        }
 })
 
-var _ = Describe("H2SpecProxySuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("H2SpecProxySuite", Ordered, ContinueOnFailure, Label("HTTP", "HTTP2", "H2Spec", "H2SpecProxy", "Proxy"), func() {
        var s VppProxySuite
        BeforeAll(func() {
                s.SetupSuite()

diff --git a/test-c/hs-test/infra/suite_vpp_udp_proxy.go b/test-c/hs-test/infra/suite_vpp_udp_proxy.go
index 43b89f1..689dc5a 100644 (file)
--- a/test-c/hs-test/infra/suite_vpp_udp_proxy.go
+++ b/test-c/hs-test/infra/suite_vpp_udp_proxy.go
@@ -142,7 +142,7 @@ func (s *VppUdpProxySuite) ClientSendReceive(toSend []byte, rcvBuffer []byte) (i
        return n, nil
 }
 
-var _ = Describe("VppUdpProxySuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("VppUdpProxySuite", Ordered, ContinueOnFailure, Label("Proxy", "UDP", "UDPproxy", "VPPproxy"), func() {
        var s VppUdpProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -171,7 +171,7 @@ var _ = Describe("VppUdpProxySuite", Ordered, ContinueOnFailure, func() {
        }
 })
 
-var _ = Describe("VppUdpProxySuiteSolo", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("VppUdpProxySuiteSolo", Ordered, ContinueOnFailure, Serial, Label("Proxy", "UDP", "UDPproxy", "VPPproxy"), func() {
        var s VppUdpProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -192,7 +192,7 @@ var _ = Describe("VppUdpProxySuiteSolo", Ordered, ContinueOnFailure, Serial, fun
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -200,7 +200,7 @@ var _ = Describe("VppUdpProxySuiteSolo", Ordered, ContinueOnFailure, Serial, fun
        }
 })
 
-var _ = Describe("VppUdpProxyMWSuite", Ordered, ContinueOnFailure, Serial, func() {
+var _ = Describe("VppUdpProxyMWSuite", Ordered, ContinueOnFailure, Serial, Label("Proxy", "UDP", "UDPproxy", "VPPproxy", "MW"), func() {
        var s VppUdpProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -221,7 +221,7 @@ var _ = Describe("VppUdpProxyMWSuite", Ordered, ContinueOnFailure, Serial, func(
                        pc := reflect.ValueOf(test).Pointer()
                        funcValue := runtime.FuncForPC(pc)
                        testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2]
-                       It(testName, Label("SOLO", "VPP Multi-Worker"), func(ctx SpecContext) {
+                       It(testName, func(ctx SpecContext) {
                                s.Log(testName + ": BEGIN")
                                test(&s)
                        }, SpecTimeout(TestTimeout))
@@ -229,7 +229,7 @@ var _ = Describe("VppUdpProxyMWSuite", Ordered, ContinueOnFailure, Serial, func(
        }
 })
 
-var _ = Describe("H2SpecUdpProxySuite", Ordered, ContinueOnFailure, func() {
+var _ = Describe("H2SpecUdpProxySuite", Ordered, ContinueOnFailure, Label("HTTP", "HTTP2", "UDP", "Proxy", "UDPproxy"), func() {
        var s VppUdpProxySuite
        BeforeAll(func() {
                s.SetupSuite()
@@ -306,5 +306,4 @@ var _ = Describe("H2SpecUdpProxySuite", Ordered, ContinueOnFailure, func() {
                        s.AssertEqual(0, tg.FailedCount)
                }, SpecTimeout(TestTimeout))
        }
-
 })