summaryrefslogtreecommitdiffstats
path: root/integrations
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2019-12-15 09:51:28 +0000
committerGitHub <noreply@github.com>2019-12-15 09:51:28 +0000
commite3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c (patch)
tree21dcdc6ec138a502590550672ac0a11f364935ea /integrations
parent8bea92c3dc162e24f6dcc2902dfed5ab94576826 (diff)
downloadgitea-e3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c.tar.gz
gitea-e3c3b33ea7a5a223e22688c3f0eb2d3dab9f991c.zip
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
Diffstat (limited to 'integrations')
-rw-r--r--integrations/auth_ldap_test.go6
-rw-r--r--integrations/integration_test.go8
-rw-r--r--integrations/migration-test/migration_test.go3
3 files changed, 13 insertions, 4 deletions
diff --git a/integrations/auth_ldap_test.go b/integrations/auth_ldap_test.go
index 5cb2bad57d..80286c09e6 100644
--- a/integrations/auth_ldap_test.go
+++ b/integrations/auth_ldap_test.go
@@ -5,6 +5,7 @@
package integrations
import (
+ "context"
"net/http"
"os"
"strings"
@@ -147,7 +148,7 @@ func TestLDAPUserSync(t *testing.T) {
}
defer prepareTestEnv(t)()
addAuthSourceLDAP(t, "")
- models.SyncExternalUsers()
+ models.SyncExternalUsers(context.Background())
session := loginUser(t, "user1")
// Check if users exists
@@ -206,7 +207,8 @@ func TestLDAPUserSSHKeySync(t *testing.T) {
}
defer prepareTestEnv(t)()
addAuthSourceLDAP(t, "sshPublicKey")
- models.SyncExternalUsers()
+
+ models.SyncExternalUsers(context.Background())
// Check if users has SSH keys synced
for _, u := range gitLDAPUsers {
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() {
diff --git a/integrations/migration-test/migration_test.go b/integrations/migration-test/migration_test.go
index 4fe36dc021..c274d482da 100644
--- a/integrations/migration-test/migration_test.go
+++ b/integrations/migration-test/migration_test.go
@@ -6,6 +6,7 @@ package migrations
import (
"compress/gzip"
+ "context"
"database/sql"
"fmt"
"io/ioutil"
@@ -220,7 +221,7 @@ func doMigrationTest(t *testing.T, version string) {
err := models.SetEngine()
assert.NoError(t, err)
- err = models.NewEngine(wrappedMigrate)
+ err = models.NewEngine(context.Background(), wrappedMigrate)
assert.NoError(t, err)
currentEngine.Close()
}