do not run initDB within integration tests
This commit is contained in:
parent
6621b04458
commit
5a0428ede3
1 changed files with 12 additions and 11 deletions
|
@ -9,7 +9,6 @@ import (
|
||||||
"log"
|
"log"
|
||||||
|
|
||||||
actions_model "code.gitea.io/gitea/models/actions"
|
actions_model "code.gitea.io/gitea/models/actions"
|
||||||
"code.gitea.io/gitea/models/db"
|
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/util"
|
"code.gitea.io/gitea/modules/util"
|
||||||
|
|
||||||
|
@ -30,20 +29,22 @@ var CmdActions = cli.Command{
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func runActions(ctx *cli.Context) error {
|
func maybeInitDB(stdCtx context.Context) error {
|
||||||
setting.InitProviderFromExistingFile()
|
if setting.Database.Type == "" {
|
||||||
setting.LoadCommonSettings()
|
if err := initDB(stdCtx); err != nil {
|
||||||
setting.LoadDBSetting()
|
return err
|
||||||
|
}
|
||||||
stdCtx, cancel := installSignals()
|
}
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
if err := db.InitEngine(stdCtx); err != nil {
|
|
||||||
fmt.Println(err)
|
|
||||||
fmt.Println("Check if you are using the right config file. You can use a --config directive to specify one.")
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func runActions(ctx *cli.Context) error {
|
||||||
|
stdCtx := context.Background()
|
||||||
|
|
||||||
|
if err := maybeInitDB(stdCtx); err != nil {
|
||||||
|
log.Fatalf("maybeInitDB %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
if ctx.Bool("registration-token-admin") {
|
if ctx.Bool("registration-token-admin") {
|
||||||
// ownid=0,repo_id=0,means this token is used for global
|
// ownid=0,repo_id=0,means this token is used for global
|
||||||
return runActionsRegistrationToken(stdCtx, 0, 0)
|
return runActionsRegistrationToken(stdCtx, 0, 0)
|
||||||
|
|
Loading…
Reference in a new issue