colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

call TestApp.ResetBootstrap as finalizer of the test OnTerminate hook

This commit is contained in:
Gani Georgiev 2024-03-20 23:47:19 +02:00
parent 03cec9a5ac
commit 309c4fe6fe
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/base.go
View File

@ -1279,7 +1279,7 @@ func (app *BaseApp) initLogger() error {
for { for {
select { select {
case <-done: case <-done:
handler.WriteAll(ctx) return
case <-ticker.C: case <-ticker.C:
handler.WriteAll(ctx) handler.WriteAll(ctx)
} }
@ -1289,8 +1289,13 @@ func (app *BaseApp) initLogger() error {
app.logger = slog.New(handler) app.logger = slog.New(handler)
app.OnTerminate().PreAdd(func(e *TerminateEvent) error { app.OnTerminate().PreAdd(func(e *TerminateEvent) error {
// write all remaining logs before ticker.Stop to avoid races with ResetBootstrap user calls
handler.WriteAll(context.Background())
ticker.Stop() ticker.Stop()
done <- true done <- true
return nil return nil
}) })

11
tests/app.go
View File

@ -40,10 +40,13 @@ type TestApp struct {
// //
// After this call, the app instance shouldn't be used anymore. // After this call, the app instance shouldn't be used anymore.
func (t *TestApp) Cleanup() { func (t *TestApp) Cleanup() {
t.ResetEventCalls() t.OnTerminate().Trigger(&core.TerminateEvent{App: t}, func(e *core.TerminateEvent) error {
t.ResetBootstrapState() t.TestMailer.Reset()
t.TestMailer.Reset() t.ResetEventCalls()
t.OnTerminate().Trigger(&core.TerminateEvent{App: t}) t.ResetBootstrapState()
return nil
})
if t.DataDir() != "" { if t.DataDir() != "" {
os.RemoveAll(t.DataDir()) os.RemoveAll(t.DataDir())