Skip to content

Commit 4785d5a

Browse files
committed
fix: r
Signed-off-by: ashing <[email protected]>
1 parent 30c1d11 commit 4785d5a

File tree

2 files changed

+16
-24
lines changed

2 files changed

+16
-24
lines changed

test/conformance/conformance_test.go

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,26 @@ var skippedTestsForSSL = []string{
2626

2727
var skippedTestsForTraditionalRoutes = []string{
2828
// TODO: Support ReferenceGrant resource
29-
tests.GatewayInvalidTLSConfiguration.ShortName,
3029
tests.GatewaySecretInvalidReferenceGrant.ShortName,
3130
tests.GatewaySecretMissingReferenceGrant.ShortName,
32-
tests.GatewaySecretReferenceGrantAllInNamespace.ShortName,
33-
tests.GatewaySecretReferenceGrantSpecific.ShortName,
34-
/*
35-
tests.GatewayInvalidTLSConfiguration.ShortName,
36-
tests.GatewayModifyListeners.ShortName,
37-
tests.GatewayWithAttachedRoutes.ShortName,
38-
*/
39-
tests.HTTPRouteExactPathMatching.ShortName,
40-
tests.HTTPRouteHTTPSListener.ShortName,
41-
tests.HTTPRouteHeaderMatching.ShortName,
42-
tests.HTTPRouteHostnameIntersection.ShortName,
43-
tests.HTTPRouteInvalidBackendRefUnknownKind.ShortName,
4431
tests.HTTPRouteInvalidCrossNamespaceBackendRef.ShortName,
45-
tests.HTTPRouteInvalidCrossNamespaceParentRef.ShortName,
46-
tests.HTTPRouteInvalidNonExistentBackendRef.ShortName,
47-
tests.HTTPRouteInvalidParentRefNotMatchingSectionName.ShortName,
48-
tests.HTTPRouteInvalidReferenceGrant.ShortName,
4932
tests.HTTPRouteInvalidReferenceGrant.ShortName,
50-
tests.HTTPRouteListenerHostnameMatching.ShortName,
51-
tests.HTTPRouteMatching.ShortName,
52-
tests.HTTPRouteMatchingAcrossRoutes.ShortName,
5333
tests.HTTPRoutePartiallyInvalidViaInvalidReferenceGrant.ShortName,
5434
tests.HTTPRouteReferenceGrant.ShortName,
55-
tests.HTTPRouteRequestHeaderModifier.ShortName,
56-
tests.HTTPRouteWeight.ShortName,
35+
36+
// TODO: HTTPRoute hostname intersection and listener hostname matching
37+
// tests.HTTPRouteHostnameIntersection.ShortName,
38+
// tests.HTTPRouteListenerHostnameMatching.ShortName,
39+
40+
// tests.HTTPRouteMatching.ShortName,
41+
// tests.HTTPRouteMatchingAcrossRoutes.ShortName,
42+
43+
// tests.GatewayInvalidTLSConfiguration.ShortName,
44+
// tests.HTTPRouteInvalidBackendRefUnknownKind.ShortName,
45+
// tests.HTTPRouteInvalidCrossNamespaceParentRef.ShortName,
46+
// tests.HTTPRouteInvalidNonExistentBackendRef.ShortName,
47+
// tests.HTTPRouteInvalidParentRefNotMatchingSectionName.ShortName,
48+
// tests.HTTPRouteRequestHeaderModifier.ShortName,
5749
}
5850

5951
var gatewaySupportedFeatures = []features.FeatureName{
@@ -74,8 +66,7 @@ func TestGatewayAPIConformance(t *testing.T) {
7466
opts.CleanupBaseResources = true
7567
opts.GatewayClassName = gatewayClassName
7668
opts.SupportedFeatures = sets.New(gatewaySupportedFeatures...)
77-
// opts.SkipTests = append(skippedTestsForSSL, skippedTestsForTraditionalRoutes...)
78-
opts.SkipTests = skippedTestsForSSL
69+
opts.SkipTests = append(skippedTestsForSSL, skippedTestsForTraditionalRoutes...)
7970
opts.Implementation = conformancev1.Implementation{
8071
Organization: "API7",
8172
Project: "api7-ingress-controller",

test/conformance/suite_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ func deleteNamespace(kubectl *k8s.KubectlOptions) {
6363
"gateway-conformance-infra",
6464
"gateway-conformance-web-backend",
6565
"gateway-conformance-app-backend",
66+
"api7ee-conformance-test",
6667
}
6768

6869
for _, ns := range namespacesToDelete {

0 commit comments

Comments
 (0)