test: enable GatewayWithAttachedRoutes test (#4640)

* test: enable GatewayWithAttachedRoutes test Signed-off-by: Mattia Lavacca <[email protected]> * chore: enable test for experimental suite as well Signed-off-by: Mattia Lavacca <[email protected]> --------- Signed-off-by: Mattia Lavacca <[email protected]>
Kong · Sep 12, 2023 · e87afbc · e87afbc
1 parent ba84ae3
commit e87afbc
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/test/conformance/gateway_conformance_test.go b/test/conformance/gateway_conformance_test.go
@@ -11,15 +11,14 @@ import (
 	"github.com/kong/kubernetes-ingress-controller/v2/test/internal/testenv"
 )
 
-var skippedTestsForTraditionalAndExpressionRoutes = []string{
+var commonSkippedTests = []string{
+	// HTTP
 	// extended conformance
-	// https://github.com/Kong/kubernetes-ingress-controller/issues/4166
-	// requires an 8080 listener, which our manually-built test gateway does not have
+	// https://github.com/Kong/kubernetes-ingress-controller/issues/4563
+	tests.GatewayWithAttachedRoutesWithPort8080.ShortName,
 	tests.HTTPRouteRedirectPortAndScheme.ShortName,
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/3680
 	tests.GatewayClassObservedGenerationBump.ShortName,
-	// https://github.com/Kong/kubernetes-ingress-controller/issues/3678
-	tests.TLSRouteSimpleSameNamespace.ShortName,
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/3679
 	tests.HTTPRouteQueryParamMatching.ShortName,
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/3681
@@ -28,11 +27,6 @@ var skippedTestsForTraditionalAndExpressionRoutes = []string{
 	tests.HTTPRouteRedirectScheme.ShortName,
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/4165
 	tests.HTTPRouteRequestMirror.ShortName,
-	// https://github.com/Kong/kubernetes-ingress-controller/issues/4546
-	tests.GatewayWithAttachedRoutes.ShortName,
-	tests.GatewayWithAttachedRoutesWithPort8080.ShortName,
-	// https://github.com/Kong/kubernetes-ingress-controller/issues/4562
-	tests.TLSRouteInvalidReferenceGrant.ShortName,
 
 	// experimental conformance
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/3684
@@ -41,20 +35,26 @@ var skippedTestsForTraditionalAndExpressionRoutes = []string{
 	tests.HTTPRouteRewriteHost.ShortName,
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/3686
 	tests.HTTPRouteRewritePath.ShortName,
-}
 
-var skippedTestsForExpressionRoutes = skippedTestsForTraditionalAndExpressionRoutes
+	// TLS
+	// https://github.com/Kong/kubernetes-ingress-controller/issues/4562
+	tests.TLSRouteInvalidReferenceGrant.ShortName,
+	// https://github.com/Kong/kubernetes-ingress-controller/issues/3678
+	tests.TLSRouteSimpleSameNamespace.ShortName,
+}
 
-var skippedTestsForTraditionalRoutes = append(
-	skippedTestsForTraditionalAndExpressionRoutes,
-	// core conformance
-	tests.HTTPRouteHeaderMatching.ShortName,
-	// extended conformance
-	// https://github.com/Kong/kubernetes-ingress-controller/issues/4164
-	// only 10 and 11 broken because traditional/traditional_compatible router
-	// cannot support the path > method > header precedence,
-	// but no way to omit individual cases.
-	tests.HTTPRouteMethodMatching.ShortName,
+var (
+	skippedTestsForExpressionRoutes  = commonSkippedTests
+	skippedTestsForTraditionalRoutes = append(
+		commonSkippedTests,
+		// core conformance
+		tests.HTTPRouteHeaderMatching.ShortName,
+		// extended conformance
+		// only 10 and 11 broken because traditional/traditional_compatible router
+		// cannot support the path > method > header precedence,
+		// but no way to omit individual cases.
+		tests.HTTPRouteMethodMatching.ShortName,
+	)
 )
 
 func TestGatewayConformance(t *testing.T) {

diff --git a/test/conformance/gateway_expermimental_conformance_test.go b/test/conformance/gateway_expermimental_conformance_test.go
@@ -45,7 +45,6 @@ func TestGatewayExperimentalConformance(t *testing.T) {
 					suite.SupportHTTPResponseHeaderModification,
 				),
 				SkipTests: []string{
-					tests.GatewayWithAttachedRoutes.ShortName,
 					tests.GatewayClassObservedGenerationBump.ShortName,
 				},
 			},