8000 move mesh tests to mesh folder · kubernetes-sigs/gateway-api@bfaf5ff · GitHub
[go: up one dir, main page]
Skip to content

Commit bfaf5ff

Browse files
8000 LiorLiebermanLiorLieberman
committed
move mesh tests to mesh folder
1 parent 397e794 commit bfaf5ff

12 files changed

+19
-28
lines changed

‎conformance/tests/main.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,6 @@ import (
2020
"slices"
2121

2222
meshtests "sigs.k8s.io/gateway-api/conformance/tests/mesh"
23-
"sigs.k8s.io/gateway-api/conformance/utils/suite"
2423
)
2524

2625
var ConformanceTests = slices.Clone(meshtests.MeshConformanceTests)
27-
28-
func getGatewayAndMeshTests() []suite.ConformanceTest {
29-
// tests := []suite.ConformanceTest{}
30-
ConformanceTests = append(ConformanceTests, meshtests.MeshConformanceTests...)
31-
return ConformanceTests
32-
}
33-
34-
var GatewayAndMeshConformanceTests = getGatewayAndMeshTests()

‎conformance/tests/mesh-basic.go‎ renamed to ‎conformance/tests/mesh/mesh-basic.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package tests
17+
package meshtests
1818

1919
import (
2020
"testing"
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func init() {
29-
ConformanceTests = append(ConformanceTests, MeshBasic)
29+
MeshConformanceTests = append(MeshConformanceTests, MeshBasic)
3030
}
3131

3232
var MeshBasic = suite.ConformanceTest{

‎conformance/tests/mesh-consumer-route.go‎ renamed to ‎conformance/tests/mesh/mesh-consumer-route.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package tests
17+
package meshtests
1818

1919
import (
2020
"testing"
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func init() {
29-
ConformanceTests = append(ConformanceTests, MeshConsumerRoute)
29+
MeshConformanceTests = append(MeshConformanceTests, MeshConsumerRoute)
3030
}
3131

3232
var MeshConsumerRoute = suite.ConformanceTest{
@@ -38,7 +38,7 @@ var MeshConsumerRoute = suite.ConformanceTest{
3838
features.SupportHTTPRoute,
3939
features.SupportHTTPRouteResponseHeaderModification,
4040
},
41-
Manifests: []string{"tests/mesh-consumer-route.yaml"},
41+
Manifests: []string{"tests/mesh/mesh-consumer-route.yaml"},
4242
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
4343
consumerClient := echo.ConnectToAppInNamespace(t, s, echo.MeshAppEchoV1, "gateway-conformance-mesh-consumer")
4444
consumerCases := []http.ExpectedResponse{

‎conformance/tests/mesh-consumer-route.yaml‎ renamed to ‎conformance/tests/mesh/mesh-consumer-route.yaml‎

File renamed without changes.

‎conformance/tests/mesh-frontend-hostname.go‎ renamed to ‎conformance/tests/mesh/mesh-frontend-hostname.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package tests
17+
package meshtests
1818

1919
import (
2020
"testing"
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func init() {
29-
ConformanceTests = append(ConformanceTests, MeshFrontendHostname)
29+
MeshConformanceTests = append(MeshConformanceTests, MeshFrontendHostname)
3030
}
3131

3232
var MeshFrontendHostname = suite.ConformanceTest{
@@ -38,7 +38,7 @@ var MeshFrontendHostname = suite.ConformanceTest{
3838
features.SupportHTTPRoute,
3939
features.SupportHTTPRouteResponseHeaderModification,
4040
},
41-
Manifests: []string{"tests/mesh-frontend.yaml"},
41+
Manifests: []string{"tests/mesh/mesh-frontend.yaml"},
4242
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
4343
client := echo.ConnectToApp(t, s, echo.MeshAppEchoV1)
4444
cases := []http.ExpectedResponse{

‎conformance/tests/mesh-frontend.go‎ renamed to ‎conformance/tests/mesh/mesh-frontend.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package tests
17+
package meshtests
1818

1919
import (
2020
"testing"
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func init() {
29-
ConformanceTests = append(ConformanceTests, MeshFrontend)
29+
MeshConformanceTests = append(MeshConformanceTests, MeshFrontend)
3030
}
3131

3232
var MeshFrontend = suite.ConformanceTest{
@@ -37,7 +37,7 @@ var MeshFrontend = suite.ConformanceTest{
3737
features.SupportHTTPRoute,
3838
features.SupportHTTPRouteResponseHeaderModification,
3939
},
40-
Manifests: []string{"tests/mesh-frontend.yaml"},
40+
Manifests: []string{"tests/mesh/mesh-frontend.yaml"},
4141
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
4242
client := echo.ConnectToApp(t, s, echo.MeshAppEchoV1)
4343
v2 := echo.ConnectToApp(t, s, echo.MeshAppEchoV2)

‎conformance/tests/mesh-frontend.yaml‎ renamed to ‎conformance/tests/mesh/mesh-frontend.yaml‎

File renamed without changes.

‎conformance/tests/mesh-ports.go‎ renamed to ‎conformance/tests/mesh/mesh-ports.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package tests
17+
package meshtests
1818

1919
import (
2020
"testing"
@@ -26,7 +26,7 @@ import (
2626
)
2727

2828
func init() {
29-
ConformanceTests = append(ConformanceTests, MeshPorts)
29+
MeshConformanceTests = append(MeshConformanceTests, MeshPorts)
3030
}
3131

3232
var MeshPorts = suite.ConformanceTest{
@@ -38,7 +38,7 @@ var MeshPorts = suite.ConformanceTest{
3838
features.SupportHTTPRouteParentRefPort,
3939
features.SupportHTTPRouteResponseHeaderModification,
4040
},
41-
Manifests: []string{"tests/mesh-ports.yaml"},
41+
Manifests: []string{"tests/mesh/mesh-ports.yaml"},
4242
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
4343
client := echo.ConnectToApp(t, s, echo.MeshAppEchoV1)
4444
cases := []http.ExpectedResponse{

‎conformance/tests/mesh-ports.yaml‎ renamed to ‎conformance/tests/mesh/mesh-ports.yaml‎

File renamed without changes.

‎conformance/tests/mesh-split.go‎ renamed to ‎conformance/tests/mesh/mesh-split.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package tests
17+
package meshtests
1818

1919
import (
2020
"testing"
2626
)
2727

2828
func init() {
29-
ConformanceTests = append(ConformanceTests, MeshTrafficSplit)
29+
MeshConformanceTests = append(MeshConformanceTests, MeshTrafficSplit)
3030
}
3131

3232
var MeshTrafficSplit = suite.ConformanceTest{
@@ -36,7 +36,7 @@ var MeshTrafficSplit = suite.ConformanceTest{
3636
features.SupportMesh,
3737
features.SupportHTTPRoute,
3838
},
39-
Manifests: []string{"tests/mesh-split.yaml"},
39+
Manifests: []string{"tests/mesh/mesh-split.yaml"},
4040
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
4141
client := echo.ConnectToApp(t, s, echo.MeshAppEchoV1)
4242
cases := []http.ExpectedResponse{

0 commit comments

Comments
 (0)
0