diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2021-12-01 15:50:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 15:50:01 +0800 |
| commit | 042cac5fedeec8af53080b9666fe043072f3a6be (patch) | |
| tree | b13d57faa71ba8bc9f8b3d40f5be7e3735ac66a4 /integrations | |
| parent | a3517d8668482b58cb80ba10a956fe4e27e1a429 (diff) | |
| download | gitea-042cac5fedeec8af53080b9666fe043072f3a6be.tar.gz gitea-042cac5fedeec8af53080b9666fe043072f3a6be.zip | |
Improve install code to avoid low-level mistakes. (#17779)
* Improve install code to avoid low-level mistakes.
If a user tries to do a re-install in a Gitea database, they gets a warning and double check.
When Gitea runs, it never create empty app.ini automatically.
Also some small (related) refactoring:
* Refactor db.InitEngine related logic make it more clean (especially for the install code)
* Move some i18n strings out from setting.go to make the setting.go can be easily maintained.
* Show errors in CLI code if an incorrect app.ini is used.
* APP_DATA_PATH is created when installing, and checked when starting (no empty directory is created any more).
Diffstat (limited to 'integrations')
| -rw-r--r-- | integrations/integration_test.go | 8 | ||||
| -rw-r--r-- | integrations/migration-test/migration_test.go | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 710e2b3b30..6dfc7350de 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -164,8 +164,8 @@ func initIntegrationTest() { } setting.SetCustomPathAndConf("", "", "") - setting.NewContext() - util.RemoveAll(models.LocalCopyPath()) + setting.LoadForTest() + _ = util.RemoveAll(models.LocalCopyPath()) git.CheckLFSVersion() setting.InitDBConfig() if err := storage.Init(); err != nil { @@ -240,7 +240,8 @@ func initIntegrationTest() { } defer db.Close() } - routers.GlobalInit(graceful.GetManager().HammerContext()) + + routers.GlobalInitInstalled(graceful.GetManager().HammerContext()) } func prepareTestEnv(t testing.TB, skip ...int) func() { @@ -254,6 +255,7 @@ func prepareTestEnv(t testing.TB, skip ...int) func() { assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) assert.NoError(t, util.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath)) + return deferFn } diff --git a/integrations/migration-test/migration_test.go b/integrations/migration-test/migration_test.go index 1e74fcc94d..57354c39cb 100644 --- a/integrations/migration-test/migration_test.go +++ b/integrations/migration-test/migration_test.go @@ -56,7 +56,7 @@ func initMigrationTest(t *testing.T) func() { setting.CustomConf = giteaConf } - setting.NewContext() + setting.LoadForTest() assert.True(t, len(setting.RepoRootPath) != 0) assert.NoError(t, util.RemoveAll(setting.RepoRootPath)) |