NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-08 18:04:14 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Merge pull request '[v7.0/forgejo] [FEAT] Mark database errors in tests as failure' (#2978) from bp-v7.0/forgejo-2dabd20 into v7.0/forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2978
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-04-02 15:53:23 +00:00
commit a89e146cb0
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
models/db/engine.go
View file

@ -155,8 +155,14 @@ func InitEngine(ctx context.Context) error {
Logger: log.GetLogger("xorm"), Logger: log.GetLogger("xorm"),
}) })
} }
errorLogger := log.GetLogger("xorm")
if setting.IsInTesting {
errorLogger = log.GetLogger(log.DEFAULT)
}
xormEngine.AddHook(&ErrorQueryHook{ xormEngine.AddHook(&ErrorQueryHook{
Logger: log.GetLogger("xorm"), Logger: errorLogger,
}) })
SetDefaultEngine(ctx, xormEngine) SetDefaultEngine(ctx, xormEngine)

3
modules/testlogger/testlogger.go
View file

@ -357,6 +357,9 @@ var ignoredErrorMessage = []string{
// TestRenameInvalidUsername // TestRenameInvalidUsername
`TrString() [E] Missing translation "form.Name"`, `TrString() [E] Missing translation "form.Name"`,
// TestDatabaseCollation
`[E] [Error SQL Query] INSERT INTO test_collation_tbl (txt) VALUES ('main') []`,
} }
func (w *testLoggerWriterCloser) recordError(msg string) { func (w *testLoggerWriterCloser) recordError(msg string) {