Chore: construct logger inside dbtest.NewDB (#57549)

construct logger inside dbtest.NewDB

Author: camdencheek

cmd/frontend/backend/external_services_test.go

@@ -392,8 +392,7 @@ func TestExternalService_ListNamespaces(t *testing.T) {
 
 			logger := logtest.Scoped(t)
 
-			sqlDB := dbtest.NewDB(logger, t)
-			db := database.NewDB(logger, sqlDB)
+			db := database.NewDB(logger, dbtest.NewDB(t))
 
 			var store internalrepos.Store
 			if tc.externalService != nil {
@@ -626,8 +625,7 @@ func TestExternalService_DiscoverRepos(t *testing.T) {
 
 			logger := logtest.Scoped(t)
 
-			sqlDB := dbtest.NewDB(logger, t)
-			db := database.NewDB(logger, sqlDB)
+			db := database.NewDB(logger, dbtest.NewDB(t))
 
 			var store internalrepos.Store
 			if tc.externalService != nil {

cmd/frontend/backend/user_emails_test.go

@@ -288,7 +288,7 @@ func TestSendUserEmailOnTokenChange(t *testing.T) {
 
 func TestUserEmailsAddRemove(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 	txemail.DisableSilently()
 
@@ -357,7 +357,7 @@ func TestUserEmailsAddRemove(t *testing.T) {
 
 func TestUserEmailsSetPrimary(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 	txemail.DisableSilently()
 
@@ -398,7 +398,7 @@ func TestUserEmailsSetPrimary(t *testing.T) {
 
 func TestUserEmailsSetVerified(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 	txemail.DisableSilently()
 
@@ -447,7 +447,7 @@ func TestUserEmailsSetVerified(t *testing.T) {
 
 func TestUserEmailsResendVerificationEmail(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 	txemail.DisableSilently()
 
@@ -520,7 +520,7 @@ func TestUserEmailsResendVerificationEmail(t *testing.T) {
 
 func TestRemoveStalePerforceAccount(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 	txemail.DisableSilently()
 

cmd/frontend/backend/webhooks_test.go

@@ -123,7 +123,7 @@ func TestCreateWebhook(t *testing.T) {
 
 func TestCreateUpdateDeleteWebhook(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 
 	users := dbmocks.NewMockUserStore()

cmd/frontend/graphqlbackend/executor_secrets_test.go

@@ -22,7 +22,7 @@ import (
 
 func TestSchemaResolver_CreateExecutorSecret(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	r := &schemaResolver{logger: logger, db: db}
 	ctx := context.Background()
 
@@ -112,7 +112,7 @@ func TestSchemaResolver_CreateExecutorSecret(t *testing.T) {
 
 func TestSchemaResolver_UpdateExecutorSecret(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	r := &schemaResolver{logger: logger, db: db}
 	ctx := context.Background()
 	internalCtx := actor.WithInternalActor(ctx)
@@ -202,7 +202,7 @@ func TestSchemaResolver_UpdateExecutorSecret(t *testing.T) {
 
 func TestSchemaResolver_DeleteExecutorSecret(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	r := &schemaResolver{logger: logger, db: db}
 	ctx := context.Background()
 	internalCtx := actor.WithInternalActor(ctx)
@@ -279,7 +279,7 @@ func TestSchemaResolver_DeleteExecutorSecret(t *testing.T) {
 
 func TestSchemaResolver_ExecutorSecrets(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	r := &schemaResolver{logger: logger, db: db}
 	ctx := context.Background()
 	internalCtx := actor.WithInternalActor(ctx)
@@ -349,7 +349,7 @@ func TestSchemaResolver_ExecutorSecrets(t *testing.T) {
 
 func TestUserResolver_ExecutorSecrets(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 	internalCtx := actor.WithInternalActor(ctx)
 
@@ -423,7 +423,7 @@ func TestUserResolver_ExecutorSecrets(t *testing.T) {
 
 func TestOrgResolver_ExecutorSecrets(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 	internalCtx := actor.WithInternalActor(ctx)
 
@@ -507,7 +507,7 @@ func TestOrgResolver_ExecutorSecrets(t *testing.T) {
 
 func TestExecutorSecretsIntegration(t *testing.T) {
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 
 	user, err := db.Users().Create(ctx, database.NewUser{Username: "test-1"})

cmd/frontend/graphqlbackend/external_accounts_test.go

@@ -37,7 +37,7 @@ func TestExternalAccounts_DeleteExternalAccount(t *testing.T) {
 	logger := logtest.Scoped(t)
 
 	t.Run("has github account", func(t *testing.T) {
-		db := database.NewDB(logger, dbtest.NewDB(logger, t))
+		db := database.NewDB(logger, dbtest.NewDB(t))
 		act := actor.Actor{UID: 1}
 		ctx := actor.WithActor(context.Background(), &act)
 		sr := newSchemaResolver(db, gitserver.NewClient())

cmd/frontend/graphqlbackend/gitserver_test.go

@@ -24,7 +24,7 @@ func TestGitserverResolver(t *testing.T) {
 
 	logger := logtest.Scoped(t)
 	ctx := context.Background()
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 
 	user := createTestUser(t, db, false)
 	admin := createTestUser(t, db, true)

cmd/frontend/graphqlbackend/permission_test.go

@@ -26,7 +26,7 @@ func TestPermissionResolver(t *testing.T) {
 
 	ctx := context.Background()
 
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 
 	user := createTestUser(t, db, false)
 	admin := createTestUser(t, db, true)

cmd/frontend/graphqlbackend/permissions_test.go

@@ -25,7 +25,7 @@ func TestPermissionsResolver(t *testing.T) {
 
 	ctx := context.Background()
 
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 
 	admin := createTestUser(t, db, true)
 	user := createTestUser(t, db, false)
@@ -136,7 +136,7 @@ func TestUserPermissionsListing(t *testing.T) {
 	}
 
 	ctx := context.Background()
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 
 	userID := createTestUser(t, db, false).ID
 	actorCtx := actor.WithActor(ctx, actor.FromUser(userID))

cmd/frontend/graphqlbackend/repositories_test.go

@@ -710,7 +710,7 @@ func TestRepositories_Integration(t *testing.T) {
 	}
 
 	logger := logtest.Scoped(t)
-	db := database.NewDB(logger, dbtest.NewDB(logger, t))
+	db := database.NewDB(logger, dbtest.NewDB(t))
 	ctx := context.Background()
 
 	schema := mustParseGraphQLSchema(t, db)
@@ -1125,17 +1125,17 @@ func runRepositoriesQuery(t *testing.T, ctx context.Context, schema *graphql.Sch
 	}
 
 	query := fmt.Sprintf(`
-	{ 
-		repositories(%s) { 
-			nodes { 
-				name 
-			} 
-			totalCount 
-			pageInfo { 
-				hasNextPage 
-				hasPreviousPage 
-				startCursor 
-				endCursor 
+	{
+		repositories(%s) {
+			nodes {
+				name
+			}
+			totalCount
+			pageInfo {
+				hasNextPage
+				hasPreviousPage
+				startCursor
+				endCursor
 			}
 		}
 	}`, want.args)

cmd/frontend/graphqlbackend/repository_metadata_test.go

@@ -27,7 +27,7 @@ func TestRepositoryMetadata(t *testing.T) {
 	ctx := context.Background()
 
 	logger := logtest.Scoped(t)
-	db := dbmocks.NewMockDBFrom(database.NewDB(logger, dbtest.NewDB(logger, t)))
+	db := dbmocks.NewMockDBFrom(database.NewDB(logger, dbtest.NewDB(t)))
 
 	users := dbmocks.NewMockUserStore()
 	users.GetByCurrentAuthUserFunc.SetDefaultReturn(&types.User{}, nil)