all the conformance tests enabled again

Signed-off-by: Mattia Lavacca <[email protected]>
Kong · Feb 8, 2023 · a512dcb · a512dcb
1 parent 0cb619b
commit a512dcb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/internal/controllers/gateway/gateway_utils.go b/internal/controllers/gateway/gateway_utils.go
@@ -313,7 +313,7 @@ func getListenerStatus(
  AttachedRoutes: listenerToAttached[listener.Name],
  }
 
- // if the resolvedRefs condition is not successfull, append the resolvedRefs condition failed with the proper reason
+ // if the resolvedRefs condition is not successful, append the resolvedRefs condition failed with the proper reason
  if ResolvedRefsReason != gatewayv1beta1.ListenerReasonResolvedRefs {
  status.Conditions = append(status.Conditions, metav1.Condition{
  Type: string(gatewayv1beta1.ListenerConditionResolvedRefs),

diff --git a/internal/controllers/gateway/gateway_utils_test.go b/internal/controllers/gateway/gateway_utils_test.go
@@ -4,13 +4,14 @@ import (
  "context"
  "testing"
 
- "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder"
  "github.com/samber/lo"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "sigs.k8s.io/controller-runtime/pkg/client/fake"
  gatewayv1beta1 "sigs.k8s.io/gateway-api/apis/v1beta1"
+
+ "github.com/kong/kubernetes-ingress-controller/v2/internal/util/builder"
 )
 
 func TestGetListenerSupportedRouteKinds(t *testing.T) {

diff --git a/test/conformance/gateway_conformance_test.go b/test/conformance/gateway_conformance_test.go
@@ -94,20 +94,19 @@ func TestGatewayConformance(t *testing.T) {
  // these tests are temporarily disabled to be able to bump the Gateway API to 0.6
  // https:/Kong/kubernetes-ingress-controller/issues/3305
  skipTests := map[string]struct{}{
- tests.GatewayInvalidRouteKind.ShortName: {},
- // tests.GatewayInvalidTLSConfiguration.ShortName: {},
- // tests.GatewaySecretReferenceGrantAllInNamespace.ShortName: {},
- // tests.GatewaySecretReferenceGrantSpecific.ShortName: {},
- // tests.HTTPRouteHeaderMatching.ShortName: {},
- // tests.HTTPRouteObservedGenerationBump.ShortName: {},
- // tests.HTTPRouteRequestRedirect.ShortName: {},
+ tests.GatewayInvalidTLSConfiguration.ShortName: {},
+ tests.GatewaySecretReferenceGrantAllInNamespace.ShortName: {},
+ tests.GatewaySecretReferenceGrantSpecific.ShortName: {},
+ tests.HTTPRouteHeaderMatching.ShortName: {},
+ tests.HTTPRouteObservedGenerationBump.ShortName: {},
+ tests.HTTPRouteRequestRedirect.ShortName: {},
  }
 
  t.Log("running gateway conformance tests")
  for _, tt := range tests.ConformanceTests {
  tt := tt
  t.Run(tt.Description, func(t *testing.T) {
- if _, ok := skipTests[tt.ShortName]; !ok {
+ if _, ok := skipTests[tt.ShortName]; ok {
  t.Skipf("skipping %s", tt.ShortName)
  }
  tt.Run(t, cSuite)