dbtest: properly close test connection (#7598)

gogs · Nov 13, 2023 · 31a0964 · 31a0964
1 parent b644d79
commit 31a0964
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/internal/dbtest/dbtest.go b/internal/dbtest/dbtest.go
@@ -55,7 +55,12 @@ func NewDB(t *testing.T, suite string, tables ...any) *gorm.DB {
 
 		dbOpts.Name = dbName
 
-		cleanup = func(_ *gorm.DB) {
+		cleanup = func(db *gorm.DB) {
+			testDB, err := db.DB()
+			if err == nil {
+				_ = testDB.Close()
+			}
+
 			_, _ = sqlDB.Exec(fmt.Sprintf("DROP DATABASE `%s`", dbName))
 			_ = sqlDB.Close()
 		}
@@ -86,7 +91,12 @@ func NewDB(t *testing.T, suite string, tables ...any) *gorm.DB {
 
 		dbOpts.Name = dbName
 
-		cleanup = func(_ *gorm.DB) {
+		cleanup = func(db *gorm.DB) {
+			testDB, err := db.DB()
+			if err == nil {
+				_ = testDB.Close()
+			}
+
 			_, _ = sqlDB.Exec(fmt.Sprintf(`DROP DATABASE %q`, dbName))
 			_ = sqlDB.Close()
 		}