From 681ff3a02a47ff453df84da5e5f4359f1d60d055 Mon Sep 17 00:00:00 2001 From: Adrian Villin Date: Fri, 7 Jun 2024 06:45:48 -0400 Subject: hs-test: added filenames to test names - It is now possible to only run tests that are in a certain file Type: test Change-Id: I41665dd2bc0942c283be36a5af3e560fd65e9d03 Signed-off-by: Adrian Villin --- extras/hs-test/suite_veth_test.go | 48 +++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'extras/hs-test/suite_veth_test.go') diff --git a/extras/hs-test/suite_veth_test.go b/extras/hs-test/suite_veth_test.go index 13ef5ef268d..49a36cacb83 100644 --- a/extras/hs-test/suite_veth_test.go +++ b/extras/hs-test/suite_veth_test.go @@ -16,18 +16,18 @@ const ( clientInterfaceName = "cln" ) -var vethTests = []func(s *VethsSuite){} -var vethSoloTests = []func(s *VethsSuite){} +var vethTests = map[string][]func(s *VethsSuite){} +var vethSoloTests = map[string][]func(s *VethsSuite){} type VethsSuite struct { HstSuite } func registerVethTests(tests ...func(s *VethsSuite)) { - vethTests = append(vethTests, tests...) + vethTests[getTestFilename()] = tests } func registerSoloVethTests(tests ...func(s *VethsSuite)) { - vethSoloTests = append(vethSoloTests, tests...) + vethSoloTests[getTestFilename()] = tests } func (s *VethsSuite) SetupSuite() { @@ -101,15 +101,17 @@ var _ = Describe("VethsSuite", Ordered, ContinueOnFailure, func() { }) // https://onsi.github.io/ginkgo/#dynamically-generating-specs - for _, test := range vethTests { - test := test - pc := reflect.ValueOf(test).Pointer() - funcValue := runtime.FuncForPC(pc) - testName := strings.Split(funcValue.Name(), ".")[2] - It(testName, func(ctx SpecContext) { - s.log(testName + ": BEGIN") - test(&s) - }, SpecTimeout(suiteTimeout)) + for filename, tests := range vethTests { + for _, test := range tests { + test := test + pc := reflect.ValueOf(test).Pointer() + funcValue := runtime.FuncForPC(pc) + testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2] + It(testName, func(ctx SpecContext) { + s.log(testName + ": BEGIN") + test(&s) + }, SpecTimeout(suiteTimeout)) + } } }) @@ -129,14 +131,16 @@ var _ = Describe("VethsSuiteSolo", Ordered, ContinueOnFailure, Serial, func() { }) // https://onsi.github.io/ginkgo/#dynamically-generating-specs - for _, test := range vethSoloTests { - test := test - pc := reflect.ValueOf(test).Pointer() - funcValue := runtime.FuncForPC(pc) - testName := strings.Split(funcValue.Name(), ".")[2] - It(testName, Label("SOLO"), func(ctx SpecContext) { - s.log(testName + ": BEGIN") - test(&s) - }, SpecTimeout(suiteTimeout)) + for filename, tests := range vethSoloTests { + for _, test := range tests { + test := test + pc := reflect.ValueOf(test).Pointer() + funcValue := runtime.FuncForPC(pc) + testName := filename + "/" + strings.Split(funcValue.Name(), ".")[2] + It(testName, Label("SOLO"), func(ctx SpecContext) { + s.log(testName + ": BEGIN") + test(&s) + }, SpecTimeout(suiteTimeout)) + } } }) -- cgit 1.2.3-korg