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

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2978
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>

models/db/engine.go

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

modules/testlogger/testlogger.go

@@ -357,6 +357,9 @@ var ignoredErrorMessage = []string{
 
 	// TestRenameInvalidUsername
 	`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) {