From e3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 15 Dec 2019 09:51:28 +0000 Subject: Graceful: Xorm, RepoIndexer, Cron and Others (#9282) * Change graceful to use a singleton obtained through GetManager instead of a global. * Graceful: Make TestPullRequests shutdownable * Graceful: Make the cron tasks graceful * Graceful: AddTestPullRequest run in graceful ctx * Graceful: SyncMirrors shutdown * Graceful: SetDefaultContext for Xorm to be HammerContext * Avoid starting graceful for migrate commands and checkout * Graceful: DeliverHooks now can be shutdown * Fix multiple syncing errors in modules/sync/UniqueQueue & Make UniqueQueue closable * Begin the process of making the repo indexer shutdown gracefully --- integrations/integration_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'integrations/integration_test.go') diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 5da9e04c78..bf363f3b4d 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -6,6 +6,7 @@ package integrations import ( "bytes" + "context" "database/sql" "encoding/json" "fmt" @@ -24,6 +25,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers" "code.gitea.io/gitea/routers/routes" @@ -55,6 +57,10 @@ func NewNilResponseRecorder() *NilResponseRecorder { } func TestMain(m *testing.M) { + managerCtx, cancel := context.WithCancel(context.Background()) + graceful.InitManager(managerCtx) + defer cancel() + initIntegrationTest() mac = routes.NewMacaron() routes.RegisterRoutes(mac) @@ -171,7 +177,7 @@ func initIntegrationTest() { } defer db.Close() } - routers.GlobalInit() + routers.GlobalInit(graceful.GetManager().HammerContext()) } func prepareTestEnv(t testing.TB, skip ...int) func() { -- cgit v1.2.3