Fix test

Author: lunny

routers/api/v1/repo/main_test.go

@@ -17,8 +17,6 @@ func TestMain(m *testing.M) {
 	setting.LoadForTest()
 	unittest.MainTest(m, &unittest.TestOptions{
 		GiteaRootPath: filepath.Join("..", "..", "..", ".."),
-		SetUp: func() error {
-			return webhook_service.Init()
-		},
+		SetUp:         webhook_service.Init,
 	})
 }

services/webhook/deliver.go

@@ -203,18 +203,14 @@ func Deliver(ctx context.Context, t *webhook_model.HookTask) error {
 }
 
 // populateDeliverHooks checks and delivers undelivered hooks.
-// FIXME: graceful: This would likely benefit from either a worker pool with dummy queue
-// or a full queue. Then more hooks could be sent at same time.
 func populateDeliverHooks(ctx context.Context) {
 	select {
 	case <-ctx.Done():
 		return
 	default:
 	}
-
 	ctx, _, finished := process.GetManager().AddTypedContext(ctx, "Service: DeliverHooks", process.SystemProcessType, true)
 	defer finished()
-
 	tasks, err := webhook_model.FindUndeliveredHookTasks()
 	if err != nil {
 		log.Error("DeliverHooks: %v", err)

services/webhook/main_test.go

@@ -9,16 +9,13 @@ import (
 	"testing"
 
 	"code.gitea.io/gitea/models/unittest"
-	webhook_service "code.gitea.io/gitea/services/webhook"
 
 	_ "code.gitea.io/gitea/models"
 )
 
 func TestMain(m *testing.M) {
 	unittest.MainTest(m, &unittest.TestOptions{
 		GiteaRootPath: filepath.Join("..", ".."),
-		SetUp: func() error {
-			return webhook_service.Init()
-		},
+		SetUp:         Init,
 	})
 }