-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
6 changed files
with
259 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| package flags | ||
|
|
||
| import ( | ||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| // EnvironmentFlags contains information for specifying multiple environments. | ||
| type EnvironmentFlags struct { | ||
| Environments []string | ||
| } | ||
|
|
||
| func NewEnvironmentFlags() *EnvironmentFlags { | ||
| return &EnvironmentFlags{ | ||
| Environments: []string{}, | ||
| } | ||
| } | ||
|
|
||
| func (f *EnvironmentFlags) BindFlags(fs *pflag.FlagSet) { | ||
| fs.StringSliceVar(&f.Environments, | ||
| "env", | ||
| f.Environments, | ||
| "specify one or more environments (use --env multiple times for more than one)") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| package ginkgofilter | ||
|
|
||
| import ( | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "k8s.io/apimachinery/pkg/util/sets" | ||
|
|
||
| "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo" | ||
| ) | ||
|
|
||
| // FilterTestCases filters test cases based on the environment flags | ||
| func FilterTestCases(testCases []*ginkgo.TestCase, envFlags sets.Set[string]) []*ginkgo.TestCase { | ||
| var filtered []*ginkgo.TestCase | ||
|
|
||
| testCaseLoop: | ||
| for _, testCase := range testCases { | ||
| testHasInclude := false | ||
| annotations := extractAnnotations(testCase.Name) | ||
|
|
||
| for _, a := range annotations { | ||
| la := strings.ToLower(a) | ||
|
|
||
| if strings.HasPrefix(strings.ToLower(a), "skipped:") { | ||
| condition := strings.TrimPrefix(la, "skipped:") | ||
| if envFlags.Has(condition) { | ||
| continue testCaseLoop // skip this test | ||
| } | ||
| } | ||
|
|
||
| if strings.HasPrefix(strings.ToLower(a), "include:") { | ||
| testHasInclude = true | ||
| condition := strings.TrimPrefix(la, "include:") | ||
| if envFlags.Has(condition) { | ||
| filtered = append(filtered, testCase) // include this test for sure | ||
| break | ||
| } | ||
| } | ||
| } | ||
| if !testHasInclude { | ||
| filtered = append(filtered, testCase) | ||
| } | ||
| } | ||
|
|
||
| return filtered | ||
| } | ||
|
|
||
| func extractAnnotations(testName string) []string { | ||
| // Define a regex to match all text within square brackets but exclude the brackets themselves | ||
| re := regexp.MustCompile(`\[(.*?)\]`) | ||
| matches := re.FindAllStringSubmatch(testName, -1) | ||
|
|
||
| var annotations []string | ||
| for _, match := range matches { | ||
| if len(match) > 1 { | ||
| annotations = append(annotations, match[1]) | ||
| } | ||
| } | ||
| return annotations | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| package ginkgofilter | ||
|
|
||
| import ( | ||
| "reflect" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "k8s.io/apimachinery/pkg/util/sets" | ||
|
|
||
| "github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo" | ||
| ) | ||
|
|
||
| func TestFilterTestCases(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| testCases []*ginkgo.TestCase | ||
| envFlags sets.Set[string] | ||
| want []*ginkgo.TestCase | ||
| }{ | ||
| { | ||
| name: "Skip AWS platform test", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:Platform:AWS]"}, | ||
| {Name: "Test2 [Include:Platform:AWS]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| envFlags: sets.New[string]("platform:aws"), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test2 [Include:Platform:AWS]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "No match for skipped conditions", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:Platform:GCP]"}, | ||
| {Name: "Test2"}, | ||
| }, | ||
| envFlags: sets.New[string]("platform:aws"), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:Platform:GCP]"}, | ||
| {Name: "Test2"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Run only specific environment", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Include:platform:gcp]"}, | ||
| {Name: "Test2 [Include:platform:aws]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| envFlags: sets.New[string]("platform:aws"), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test2 [Include:platform:aws]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Skip test with no matching environment", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:topology:ha]"}, | ||
| {Name: "Test2 [platform:aws]"}, | ||
| }, | ||
| envFlags: sets.New[string]("platform:aws", "network:v6"), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:topology:ha]"}, | ||
| {Name: "Test2 [platform:aws]"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Empty test cases list", | ||
| testCases: []*ginkgo.TestCase{}, | ||
| envFlags: sets.New[string]("platform:aws"), | ||
| want: []*ginkgo.TestCase{}, | ||
| }, | ||
| { | ||
| name: "No env flags provided", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [platform:aws]"}, | ||
| {Name: "Test2 [Skipped:platform:gcp]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| envFlags: sets.New[string](), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [platform:aws]"}, | ||
| {Name: "Test2 [Skipped:platform:gcp]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Skip condition in middle of test name", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:platform:aws] Test with AWS"}, | ||
| {Name: "Test2 [Skipped:platform:gcp]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| envFlags: sets.New[string]("platform:aws"), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test2 [Skipped:platform:gcp]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Case insensitive skip", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:Platform:AWS]"}, | ||
| {Name: "Test2 [platform:aws]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| envFlags: sets.New[string]("platform:aws"), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test2 [platform:aws]"}, | ||
| {Name: "Test3"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Multiple environment conditions", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Skipped:Platform:AWS]"}, | ||
| {Name: "Test2 [Include:NetworkStack:v6]"}, | ||
| {Name: "Test3 [Skipped:topology:ha]"}, | ||
| }, | ||
| envFlags: sets.New("platform:aws", "networkstack:v6"), | ||
| want: []*ginkgo.TestCase{ | ||
| {Name: "Test2 [Include:NetworkStack:v6]"}, | ||
| {Name: "Test3 [Skipped:topology:ha]"}, | ||
| }, | ||
| }, | ||
| { | ||
| name: "Multiple run-only conditions, no matches", | ||
| testCases: []*ginkgo.TestCase{ | ||
| {Name: "Test1 [Include:platform:gcp]"}, | ||
| {Name: "Test2 [Include:networkstack:v4]"}, | ||
| }, | ||
| envFlags: sets.New[string]("platform:aws", "networkstack:v6"), | ||
| want: []*ginkgo.TestCase{}, | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| if got := FilterTestCases(tt.testCases, tt.envFlags); !reflect.DeepEqual(got, tt.want) { | ||
| if len(tt.want) == 0 && len(got) == 0 { | ||
| return | ||
| } | ||
|
|
||
| var gotSlice, wantSlice []string | ||
| for _, g := range got { | ||
| gotSlice = append(gotSlice, g.Name) | ||
| } | ||
| for _, w := range tt.want { | ||
| wantSlice = append(wantSlice, w.Name) | ||
| } | ||
|
|
||
| t.Errorf("FilterTestCases() = %v, wanted %v", strings.Join(gotSlice, ", "), strings.Join(wantSlice, ", ")) | ||
| } | ||
| }) | ||
| } | ||
| } |