jwtauthccl: unskip TestSubjectReservedUser and TestAudienceCheck

rafiss · rafiss · commit 49445378cc90 · 2023-04-04T12:23:19.000-04:00
I'm making this commit to see if these tests were failing just because
the bazel timeout was too low. I'll run it in CI multiple times before
merging, since previously this was only failing in CI.

Release note: None
diff --git a/pkg/ccl/jwtauthccl/BUILD.bazel b/pkg/ccl/jwtauthccl/BUILD.bazel
@@ -28,13 +28,13 @@ go_library(
 
 go_test(
     name = "jwtauthccl_test",
-    size = "small",
+    size = "medium",
     srcs = [
         "authentication_jwt_test.go",
         "main_test.go",
         "settings_test.go",
     ],
-    args = ["-test.timeout=55s"],
+    args = ["-test.timeout=295s"],
     embed = [":jwtauthccl"],
     tags = ["ccl_test"],
     deps = [
@@ -46,7 +46,6 @@ go_test(
         "//pkg/server",
         "//pkg/sql/pgwire/identmap",
         "//pkg/testutils/serverutils",
-        "//pkg/testutils/skip",
         "//pkg/testutils/testcluster",
         "//pkg/util/leaktest",
         "//pkg/util/log",
diff --git a/pkg/ccl/jwtauthccl/authentication_jwt_test.go b/pkg/ccl/jwtauthccl/authentication_jwt_test.go
@@ -23,7 +23,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/identmap"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
-	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/timeutil"
@@ -401,7 +400,6 @@ func TestSubjectMappingCheck(t *testing.T) {
 func TestSubjectReservedUser(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	skip.WithIssue(t, 100412)
 
 	ctx := context.Background()
 	s, _, _ := serverutils.StartServer(t, base.TestServerArgs{})
@@ -432,7 +430,6 @@ func TestSubjectReservedUser(t *testing.T) {
 func TestAudienceCheck(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	skip.WithIssue(t, 100356)
 	ctx := context.Background()
 	s, _, _ := serverutils.StartServer(t, base.TestServerArgs{})
 	defer s.Stopper().Stop(ctx)
diff --git a/pkg/ccl/jwtauthccl/main_test.go b/pkg/ccl/jwtauthccl/main_test.go
@@ -29,3 +29,5 @@ func TestMain(m *testing.M) {
 	serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)
 	os.Exit(m.Run())
 }
+
+//go:generate ../../util/leaktest/add-leaktest.sh *_test.go
diff --git a/pkg/ccl/jwtauthccl/settings_test.go b/pkg/ccl/jwtauthccl/settings_test.go
@@ -11,10 +11,12 @@ package jwtauthccl
 import (
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/stretchr/testify/require"
 )
 
 func TestValidateAndParseJWTAuthIssuers(t *testing.T) {
+	defer leaktest.AfterTest(t)()
 	tests := []struct {
 		name            string
 		setting         string
@@ -57,6 +59,7 @@ func TestValidateAndParseJWTAuthIssuers(t *testing.T) {
 }
 
 func TestValidateAndParseJWTAuthAudience(t *testing.T) {
+	defer leaktest.AfterTest(t)()
 	tests := []struct {
 		name            string
 		setting         string
@@ -99,6 +102,7 @@ func TestValidateAndParseJWTAuthAudience(t *testing.T) {
 }
 
 func TestValidateAndParseJWTAuthJWKS(t *testing.T) {
+	defer leaktest.AfterTest(t)()
 	tests := []struct {
 		name          string
 		setting       string

Original file line number	Diff line number	Diff line change
`@@ -29,3 +29,5 @@ func TestMain(m *testing.M) {`
`29`	`29`	`serverutils.InitTestClusterFactory(testcluster.TestClusterFactory)`
`30`	`30`	`os.Exit(m.Run())`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+//go:generate ../../util/leaktest/add-leaktest.sh *_test.go`