Mirrors/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2026-01-23 02:24:24 +00:00
Code Issues Projects Releases Wiki Activity

TestMain: Handle "defer" before os.Exit #5330

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2025-11-21 18:58:36 +01:00
parent 6c50a87632
commit d023139c12
17 changed files with 66 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/api/api_test.go
View file

@ -32,7 +32,6 @@ func TestMain(m *testing.M) {
// Init test config.
c := config.TestConfig()
get.SetConfig(c)
defer c.CloseDb()
// Increase login rate limit for testing.
limiter.Login = limiter.NewLimit(1, 10000)
@ -40,6 +39,10 @@ func TestMain(m *testing.M) {
// Run unit tests.
code := m.Run()
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)

6
internal/api/users_passcode_test.go
View file

@ -245,7 +245,7 @@ func TestUserPasscode(t *testing.T) {
pcStr, err := json.Marshal(f0)
if err != nil {
log.Fatal(err)
t.Fatalf("marshal passcode: %v", err)
}
r := AuthenticatedRequestWithBody(app, "POST", "/api/v1/users/uqxetse3cy5eo9z2/passcode", string(pcStr), sessId)
@ -264,7 +264,7 @@ func TestUserPasscode(t *testing.T) {
ConfirmUserPasscode(router)
if err != nil {
t.Fatal(err)
t.Fatalf("generate totp code: %v", err)
}
f := form.Passcode{
@ -276,7 +276,7 @@ func TestUserPasscode(t *testing.T) {
pcStr, err = json.Marshal(f)
if err != nil {
log.Fatal(err)
t.Fatalf("marshal passcode confirm: %v", err)
}
r = AuthenticatedRequestWithBody(app, "POST", "/api/v1/users/uqxetse3cy5eo9z2/passcode/confirm", string(pcStr), sessId)

5
internal/auth/session/session_test.go
View file

@ -21,10 +21,11 @@ func TestMain(m *testing.M) {
code := m.Run()
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)
if err := c.CloseDb(); err != nil {
log.Fatalf("close db: %v", err)
log.Errorf("close db: %v", err)
}
fs.PurgeTestDbFiles(".", false)
os.Exit(code)
}

7
internal/commands/commands_test.go
View file

@ -35,7 +35,6 @@ func TestMain(m *testing.M) {
if err != nil {
panic(err)
}
defer os.RemoveAll(tempDir)
c := config.NewMinimalTestConfigWithDb("commands", tempDir)
get.SetConfig(c)
@ -51,6 +50,12 @@ func TestMain(m *testing.M) {
// Run unit tests.
code := m.Run()
if err = c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
_ = os.RemoveAll(tempDir)
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)

5
internal/config/config_test.go
View file

@ -28,11 +28,14 @@ func TestMain(m *testing.M) {
log.SetLevel(logrus.TraceLevel)
c := TestConfig()
defer c.CloseDb()
code := m.Run()
// Remove temporary SQLite files after running the tests.
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
fs.PurgeTestDbFiles(".", false)
os.Exit(code)

4
internal/entity/entity_test.go
View file

@ -23,11 +23,11 @@ func TestMain(m *testing.M) {
os.Getenv("PHOTOPRISM_TEST_DRIVER"),
os.Getenv("PHOTOPRISM_TEST_DSN"))
defer db.Close()
code := m.Run()
// Remove temporary SQLite files after running the tests.
db.Close()
fs.PurgeTestDbFiles(".", false)
os.Exit(code)

4
internal/entity/query/query_test.go
View file

@ -22,11 +22,11 @@ func TestMain(m *testing.M) {
os.Getenv("PHOTOPRISM_TEST_DRIVER"),
os.Getenv("PHOTOPRISM_TEST_DSN"))
defer db.Close()
code := m.Run()
// Remove temporary SQLite files after running the tests.
db.Close()
fs.PurgeTestDbFiles(".", false)
os.Exit(code)

5
internal/photoprism/backup/backup_test.go
View file

@ -22,7 +22,6 @@ func TestMain(m *testing.M) {
fs.PurgeTestDbFiles(".", false)
c := config.TestConfig()
defer c.CloseDb()
get.SetConfig(c)
photoprism.SetConfig(c)
@ -30,6 +29,10 @@ func TestMain(m *testing.M) {
code := m.Run()
// Remove temporary SQLite files after running the tests.
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
fs.PurgeTestDbFiles(".", false)
os.Exit(code)

5
internal/photoprism/batch/batch_test.go
View file

@ -23,7 +23,6 @@ func TestMain(m *testing.M) {
fs.PurgeTestDbFiles(".", false)
c := config.TestConfig()
defer c.CloseDb()
get.SetConfig(c)
photoprism.SetConfig(c)
@ -31,6 +30,10 @@ func TestMain(m *testing.M) {
code := m.Run()
// Remove temporary SQLite files after running the tests.
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
fs.PurgeTestDbFiles(".", false)
os.Exit(code)

10
internal/photoprism/get/get_test.go
View file

@ -13,14 +13,20 @@ func TestMain(m *testing.M) {
if err != nil {
panic(err)
}
defer os.RemoveAll(tempDir)
c := config.NewMinimalTestConfigWithDb("test", tempDir)
SetConfig(c)
defer c.CloseDb()
code := m.Run()
if err = c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
if err = os.RemoveAll(tempDir); err != nil {
log.Errorf("remove temp dir: %v", err)
}
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)

4
internal/photoprism/get/jwt_test.go
View file

@ -28,7 +28,9 @@ func TestJWTVerifierResetOnConfigChange(t *testing.T) {
SetConfig(tempConf)
t.Cleanup(func() {
SetConfig(orig)
tempConf.CloseDb()
if err := tempConf.CloseDb(); err != nil {
t.Logf("close db: %v", err)
}
orig.RegisterDb()
})

5
internal/photoprism/photoprism_test.go
View file

@ -19,10 +19,13 @@ func TestMain(m *testing.M) {
c := config.NewTestConfig("photoprism")
SetConfig(c)
defer c.CloseDb()
code := m.Run()
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)

5
internal/server/server_test.go
View file

@ -25,7 +25,6 @@ func TestMain(m *testing.M) {
// Init test config.
c := config.TestConfig()
get.SetConfig(c)
defer c.CloseDb()
// Increase login rate limit for testing.
limiter.Login = limiter.NewLimit(1, 10000)
@ -33,6 +32,10 @@ func TestMain(m *testing.M) {
// Run unit tests.
code := m.Run()
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)

8
internal/thumb/avatar/avatar_test.go
View file

@ -20,15 +20,19 @@ func TestMain(m *testing.M) {
if err != nil {
panic(err)
}
defer os.RemoveAll(tempDir)
c := config.NewMinimalTestConfigWithDb("avatar", tempDir)
get.SetConfig(c)
photoprism.SetConfig(c)
defer c.CloseDb()
code := m.Run()
if err = c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
_ = os.RemoveAll(tempDir)
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)

4
internal/thumb/thumb_test.go
View file

@ -15,10 +15,10 @@ func TestMain(m *testing.M) {
log.SetLevel(logrus.TraceLevel)
event.AuditLog = log
defer Shutdown()
code := m.Run()
Shutdown()
// Remove generated test files and folders.
_ = os.RemoveAll("testdata/1")
_ = os.RemoveAll("testdata/cache")

6
internal/workers/auto/auto_test.go
View file

@ -15,13 +15,13 @@ func TestMain(m *testing.M) {
log.SetLevel(logrus.TraceLevel)
c := config.TestConfig()
defer c.CloseDb()
// Run unit tests.
code := m.Run()
// Close database connection.
_ = c.CloseDb()
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)

5
internal/workers/workers_test.go
View file

@ -22,7 +22,6 @@ func TestMain(m *testing.M) {
fs.PurgeTestDbFiles(".", false)
c := config.TestConfig()
defer c.CloseDb()
get.SetConfig(c)
photoprism.SetConfig(c)
@ -30,6 +29,10 @@ func TestMain(m *testing.M) {
// Run unit tests.
code := m.Run()
if err := c.CloseDb(); err != nil {
log.Errorf("close db: %v", err)
}
// Remove temporary SQLite files after running the tests.
fs.PurgeTestDbFiles(".", false)