fix

Author: wxiaoguang

models/migrations/v1_16/v210_test.go

@@ -10,6 +10,7 @@ import (
 	"code.gitea.io/gitea/modules/timeutil"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"xorm.io/xorm/schemas"
 )
 
@@ -56,10 +57,7 @@ func Test_RemigrateU2FCredentials(t *testing.T) {
 	}
 
 	// Run the migration
-	if err := RemigrateU2FCredentials(x); err != nil {
-		assert.NoError(t, err)
-		return
-	}
+	require.NoError(t, RemigrateU2FCredentials(x))
 
 	expected := []ExpectedWebauthnCredential{}
 	if err := x.Table("expected_webauthn_credential").Asc("id").Find(&expected); !assert.NoError(t, err) {

models/unittest/fixtures_loader.go

@@ -25,12 +25,13 @@ type fixturesLoader struct {
 func (f *fixturesLoader) prepareFieldValue(v any) any {
 	if s, ok := v.(string); ok {
 		if strings.HasPrefix(s, "::HEX::") {
-			b, _ := hex.DecodeString(s[8:])
+			b, _ := hex.DecodeString(s[7:])
 			return b
 		}
 	}
 	return v
 }
+
 func (f *fixturesLoader) loadFixtures(file string) error {
 	data, err := os.ReadFile(file)
 	if err != nil {
@@ -49,12 +50,19 @@ func (f *fixturesLoader) loadFixtures(file string) error {
 		return err
 	}
 
+	sess := f.engine.NewSession()
+	err = sess.Begin()
+	if err != nil {
+		return err
+	}
+	defer sess.Close()
+
 	switch f.engine.Dialect().URI().DBType {
 	case schemas.MSSQL:
-		_, _ = f.engine.Exec("SET IDENTITY_INSERT [%s] ON", tableName)
-		defer func() {
-			_, _ = f.engine.Exec("SET IDENTITY_INSERT [%s] OFF", tableName)
-		}()
+		_, err = sess.Exec(fmt.Sprintf("SET IDENTITY_INSERT %s ON", tableNameQuoted))
+		if err != nil {
+			return err
+		}
 	}
 
 	var sqlBuf []byte
@@ -72,14 +80,14 @@ func (f *fixturesLoader) loadFixtures(file string) error {
 			sqlBuf = append(sqlBuf, "?,"...)
 		}
 		sqlBuf[len(sqlBuf)-1] = ')'
-		_, err = f.engine.Exec(append([]any{util.BytesToReadOnlyString(sqlBuf)}, sqlArguments...)...)
+		_, err = sess.Exec(append([]any{util.BytesToReadOnlyString(sqlBuf)}, sqlArguments...)...)
 		if err != nil {
 			return err
 		}
 		sqlBuf = sqlBuf[:0]
 		sqlArguments = sqlArguments[:0]
 	}
-	return nil
+	return sess.Commit()
 }
 
 func (f *fixturesLoader) Load() error {

modules/system/appstate_test.go

@@ -36,8 +36,6 @@ func (*testItem2) Name() string {
 }
 
 func TestAppStateDB(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-
 	as := &DBStore{}
 
 	item1 := new(testItem1)