Reenable testifylint (#2770)

Author: tstirrat15

.golangci.yaml

@@ -38,7 +38,7 @@ linters:
     - "spancheck"
     - "staticcheck"
     - "tagalign"
-    # - "testifylint" TODO: fix issues
+    - "testifylint"
     - "tparallel"
     - "unconvert"
     - "usetesting"

cmd/spicedb/integration/schemawatch_integration_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/ory/dockertest/v3"
 	"github.com/ory/dockertest/v3/docker"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	testdatastore "github.com/authzed/spicedb/internal/testserver/datastore"
@@ -109,7 +110,7 @@ func TestSchemaWatch(t *testing.T) {
 
 			go (func() {
 				err = pool.Client.Logs(opts)
-				require.NoError(t, err)
+				assert.NoError(t, err)
 			})()
 
 			select {

cmd/spicedb/integration/serve_integration_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/google/uuid"
 	"github.com/ory/dockertest/v3"
 	"github.com/ory/dockertest/v3/docker"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -238,7 +239,7 @@ func TestGracefulShutdown(t *testing.T) {
 
 				go (func() {
 					err = pool.Client.Logs(opts)
-					require.NoError(t, err)
+					assert.NoError(t, err)
 				})()
 
 				select {

internal/datastore/proxy/counting_test.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
@@ -175,7 +176,7 @@ func TestCountingProxyThreadSafety(t *testing.T) {
 			r := ds.SnapshotReader(datastore.NoRevision)
 			for range callsPerGoroutine {
 				_, err := r.QueryRelationships(ctx, datastore.RelationshipsFilter{})
-				require.NoError(err)
+				assert.NoError(t, err)
 			}
 		}()
 	}

internal/dispatch/caching/cachingdispatch_test.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/shopspring/decimal"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
@@ -206,7 +207,7 @@ func TestConcurrentDebugInfoAccess(t *testing.T) {
 				return
 			}
 
-			require.NotNil(resp.GetMetadata().GetDebugInfo().GetCheck().GetRequest())
+			assert.NotNil(t, resp.GetMetadata().GetDebugInfo().GetCheck().GetRequest())
 
 			// we mutate the response to prove that it's not shared across goroutines
 			resp.GetMetadata().GetDebugInfo().GetCheck().GetRequest().Subject.Relation = "modified"

internal/dispatch/singleflight/singleflight_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/bits-and-blooms/bloom/v3"
 	"github.com/prometheus/client_golang/prometheus"
 	promclient "github.com/prometheus/client_model/go"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/authzed/spicedb/internal/dispatch"
@@ -43,7 +44,7 @@ func TestSingleFlightDispatcher(t *testing.T) {
 	wg.Add(4)
 	go func() {
 		resp1, err := disp.DispatchCheck(t.Context(), req.CloneVT())
-		require.NoError(t, err)
+		assert.NoError(t, err)
 		// this goroutine mutates the response; other goroutines that read should be unaffected
 		resp1.GetMetadata().GetDebugInfo().GetCheck().GetSubProblems()[0].IsCachedResult = false
 		wg.Done()

internal/services/integrationtesting/perf_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	v1 "github.com/authzed/authzed-go/proto/authzed/api/v1"
@@ -66,7 +67,7 @@ func TestBurst(t *testing.T) {
 						Permission: "viewer",
 						Subject:    rel.Subject,
 					})
-					require.NoError(t, err)
+					assert.NoError(t, err)
 				}()
 				run <- struct{}{}
 			}

pkg/cmd/server/server_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/sdk/trace"
@@ -191,7 +192,7 @@ func TestDisableHealthCheckTracing(t *testing.T) {
 	defer conn.Close()
 
 	go func() {
-		require.NoError(t, srv.Run(ctx))
+		assert.NoError(t, srv.Run(ctx))
 	}()
 
 	// Poll for gRPC server readiness instead of sleeping

pkg/schema/v2/convert_test.go

@@ -885,7 +885,7 @@ func TestMetadataPreservation(t *testing.T) {
 		defs, caveats, err := schema.ToDefinitions()
 		require.NoError(t, err)
 		require.Len(t, defs, 1)
-		require.Len(t, caveats, 0)
+		require.Empty(t, caveats)
 
 		// Verify metadata is preserved
 		require.NotNil(t, defs[0].Metadata, "Metadata should be preserved during round-trip conversion")
@@ -936,7 +936,7 @@ func TestMetadataPreservation(t *testing.T) {
 		// Convert back to corev1
 		defs, caveats, err := schema.ToDefinitions()
 		require.NoError(t, err)
-		require.Len(t, defs, 0)
+		require.Empty(t, defs)
 		require.Len(t, caveats, 1)
 
 		// Verify metadata is preserved