Skip to content

Commit 6539ffe

Browse files
committed
chore: remove mesh specific conformance test list
1 parent b5529c1 commit 6539ffe

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

conformance/conformance_test.go

+1-11
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,7 @@ func TestConformance(t *testing.T) {
6464
})
6565
cSuite.Setup(t)
6666

67-
// TODO(https://github.com/kubernetes-sigs/gateway-api/issues/1891) this will likely changed;
68-
// for now, we use this mechanism to split mesh and gateway types
69-
var toRun []suite.ConformanceTest
70-
if supportedFeatures.Has(suite.SupportGateway) {
71-
toRun = append(toRun, tests.ConformanceTests...)
72-
}
73-
if supportedFeatures.Has(suite.SupportMesh) {
74-
toRun = append(toRun, tests.MeshConformanceTests...)
75-
}
76-
77-
cSuite.Run(t, toRun)
67+
cSuite.Run(t, tests.ConformanceTests)
7868
}
7969

8070
// parseSupportedFeatures parses flag arguments and converts the string to

conformance/tests/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ package tests
1919
import "sigs.k8s.io/gateway-api/conformance/utils/suite"
2020

2121
var ConformanceTests []suite.ConformanceTest
22-
var MeshConformanceTests []suite.ConformanceTest

conformance/tests/mesh-basic.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
)
2626

2727
func init() {
28-
MeshConformanceTests = append(MeshConformanceTests, MeshBasic)
28+
ConformanceTests = append(ConformanceTests, MeshBasic)
2929
}
3030

3131
var MeshBasic = suite.ConformanceTest{

conformance/tests/mesh-split.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
)
2626

2727
func init() {
28-
MeshConformanceTests = append(MeshConformanceTests, MeshTrafficSplit)
28+
ConformanceTests = append(ConformanceTests, MeshTrafficSplit)
2929
}
3030

3131
var MeshTrafficSplit = suite.ConformanceTest{

0 commit comments

Comments
 (0)