test/conformance: only skip specific failing test case

Signed-off-by: Steve Kriss <[email protected]>
skriss · Jul 18, 2023 · 88180e5 · 88180e5
1 parent f9521ea
commit 88180e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/test/conformance/gatewayapi/gateway_conformance_test.go b/test/conformance/gatewayapi/gateway_conformance_test.go
@@ -59,12 +59,6 @@ func TestGatewayConformance(t *testing.T) {
 		EnableAllSupportedFeatures: true,
 		// Keep the list of skipped features in sync with
 		// test/scripts/run-gateway-conformance.sh.
-		SkipTests: []string{
-			// Checks for the original request port in the returned Location
-			// header which Envoy is stripping.
-			// See: https://github.com/envoyproxy/envoy/issues/17318
-			tests.HTTPRouteRedirectPortAndScheme.ShortName,
-		},
 		ExemptFeatures: sets.New(
 			suite.SupportMesh,
 		),

diff --git a/test/scripts/run-gateway-conformance.sh b/test/scripts/run-gateway-conformance.sh
@@ -52,15 +52,22 @@ EOF
 GO_MOD_GATEWAY_API_VERSION=$(grep "sigs.k8s.io/gateway-api" go.mod | awk '{print $2}')
 
 if [ "$GATEWAY_API_VERSION" = "$GO_MOD_GATEWAY_API_VERSION" ]; then
-  go test -timeout=40m -tags conformance ./test/conformance/gatewayapi --gateway-class=contour
+  # Skipped test checks for the original request port in the returned Location
+  # header which Envoy is stripping.
+  # See: https://github.com/envoyproxy/envoy/issues/17318
+  # Skip here instead of in the suite options since it's a subtest.
+  go test -timeout=40m -tags conformance ./test/conformance/gatewayapi --gateway-class=contour \
+    -skip TestGatewayConformance/HTTPRouteRedirectPortAndScheme/http-listener-on-8080/0_request_to_\'\/scheme-nil-and-port-nil\'_should_receive_a_302
 else 
   cd $(mktemp -d)
   git clone https://github.com/kubernetes-sigs/gateway-api
   cd gateway-api
   git checkout "${GATEWAY_API_VERSION}"
-  # TODO: Keep the list of skipped features in sync with
-  # test/conformance/gatewayapi/gateway_conformance_test.go.
-  # Can implement with the -skip flag available with go 1.20
-  # or if Gateway API supports skipping tests via custom flag.
-  go test -timeout=40m ./conformance -gateway-class=contour -all-features -exempt-features=Mesh
+  # TODO: Keep the list of skipped tests/features in sync with
+  # test/conformance/gatewayapi/gateway_conformance_test.go and
+  # the above `go test` invocation. Note that when running this
+  # way the top-level test is called "TestConformance", not
+  # "TestGatewayConformance".
+  go test -timeout=40m ./conformance -gateway-class=contour -all-features -exempt-features=Mesh \
+    -skip TestConformance/HTTPRouteRedirectPortAndScheme/http-listener-on-8080/0_request_to_\'\/scheme-nil-and-port-nil\'_should_receive_a_302
 fi