first commit: hugodutka/dbmem-coderd/provisionerdserver

hugodutka · hugodutka · commit 145023f164ee · 2025-06-08T20:52:59.000Z
diff --git a/coderd/provisionerdserver/acquirer_test.go b/coderd/provisionerdserver/acquirer_test.go
@@ -18,7 +18,6 @@ import (
 	"go.uber.org/goleak"
 
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/dbmem"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/database/provisionerjobs"
@@ -34,8 +33,7 @@ func TestMain(m *testing.M) {
 // TestAcquirer_Store tests that a database.Store is accepted as a provisionerdserver.AcquirerStore
 func TestAcquirer_Store(t *testing.T) {
 	t.Parallel()
-	db := dbmem.New()
-	ps := pubsub.NewInMemory()
+	db, ps := dbtestutil.NewDB(t)
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 	defer cancel()
 	logger := testutil.Logger(t)
diff --git a/coderd/provisionerdserver/provisionerdserver_internal_test.go b/coderd/provisionerdserver/provisionerdserver_internal_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
-	"github.com/coder/coder/v2/coderd/database/dbmem"
+	"github.com/coder/coder/v2/coderd/database/dbtestutil"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/testutil"
 )
@@ -21,14 +21,14 @@ func TestObtainOIDCAccessToken(t *testing.T) {
 	ctx := context.Background()
 	t.Run("NoToken", func(t *testing.T) {
 		t.Parallel()
-		db := dbmem.New()
+		db, _ := dbtestutil.NewDB(t)
 		_, err := obtainOIDCAccessToken(ctx, db, nil, uuid.Nil)
 		require.NoError(t, err)
 	})
 	t.Run("InvalidConfig", func(t *testing.T) {
 		// We still want OIDC to succeed even if exchanging the token fails.
 		t.Parallel()
-		db := dbmem.New()
+		db, _ := dbtestutil.NewDB(t)
 		user := dbgen.User(t, db, database.User{})
 		dbgen.UserLink(t, db, database.UserLink{
 			UserID:      user.ID,
@@ -40,7 +40,7 @@ func TestObtainOIDCAccessToken(t *testing.T) {
 	})
 	t.Run("MissingLink", func(t *testing.T) {
 		t.Parallel()
-		db := dbmem.New()
+		db, _ := dbtestutil.NewDB(t)
 		user := dbgen.User(t, db, database.User{
 			LoginType: database.LoginTypeOIDC,
 		})
@@ -50,7 +50,7 @@ func TestObtainOIDCAccessToken(t *testing.T) {
 	})
 	t.Run("Exchange", func(t *testing.T) {
 		t.Parallel()
-		db := dbmem.New()
+		db, _ := dbtestutil.NewDB(t)
 		user := dbgen.User(t, db, database.User{})
 		dbgen.UserLink(t, db, database.UserLink{
 			UserID:      user.ID,
diff --git a/coderd/provisionerdserver/provisionerdserver_test.go b/coderd/provisionerdserver/provisionerdserver_test.go
