linting

Emyrk · Emyrk · commit 33dbd920c596 · 2024-10-29T13:33:54.000-04:00
diff --git a/coderd/database/dbtestutil/tx.go b/coderd/database/dbtestutil/tx.go
@@ -4,6 +4,9 @@ import (
 	"sync"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/xerrors"
+
 	"github.com/coder/coder/v2/coderd/database"
 )
 
@@ -44,7 +47,7 @@ func StartTx(t *testing.T, db database.Store, opts *database.TxOptions) *DBTx {
 			if count > 1 {
 				// If you recursively call InTx, then don't use this.
 				t.Logf("InTx called more than once: %d", count)
-				t.Fatal("InTx called more than once, this is not allowed with the StartTx helper")
+				assert.NoError(t, xerrors.New("InTx called more than once, this is not allowed with the StartTx helper"))
 			}
 
 			<-done
diff --git a/enterprise/coderd/workspacequota_test.go b/enterprise/coderd/workspacequota_test.go
@@ -886,9 +886,3 @@ func (c *committer) UpdateWorkspaceBuildCostByID(ctx context.Context, t *testing
 func (c *committer) Done() error {
 	return c.DBTx.Done()
 }
-
-func noReturn[T any](f func(context.Context, *testing.T) T) func(context.Context, *testing.T) {
-	return func(ctx context.Context, t *testing.T) {
-		f(ctx, t)
-	}
-}
