Skip to content

Commit c64ea0c

Browse files
committed
moved prepare unit test environment into separate method to be used across unit tests
Signed-off-by: David Schneiderbauer <[email protected]>
1 parent 8df0167 commit c64ea0c

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

models/action_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package models
22

33
import (
4-
"os"
54
"path"
65
"strings"
76
"testing"
87

98
"code.gitea.io/git"
109
"code.gitea.io/gitea/modules/setting"
1110

12-
"github.com/Unknwon/com"
1311
"github.com/stretchr/testify/assert"
1412
)
1513

@@ -299,9 +297,7 @@ func TestCommitRepoAction(t *testing.T) {
299297
}
300298

301299
for _, s := range samples {
302-
assert.NoError(t, PrepareTestDatabase())
303-
assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
304-
assert.NoError(t, com.CopyDir("../integrations/gitea-repositories-meta", setting.RepoRootPath))
300+
prepareTestEnv(t)
305301

306302
user := AssertExistsAndLoadBean(t, &User{ID: s.userID}).(*User)
307303
repo := AssertExistsAndLoadBean(t, &Repository{ID: s.repositoryID, OwnerID: user.ID}).(*Repository)

models/unit_tests.go

+10
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
package models
66

77
import (
8+
"os"
89
"testing"
910

11+
"code.gitea.io/gitea/modules/setting"
12+
13+
"github.com/Unknwon/com"
1014
"github.com/go-xorm/core"
1115
"github.com/go-xorm/xorm"
1216
"github.com/stretchr/testify/assert"
@@ -38,6 +42,12 @@ func PrepareTestDatabase() error {
3842
return LoadFixtures()
3943
}
4044

45+
func prepareTestEnv(t testing.TB) {
46+
assert.NoError(t, PrepareTestDatabase())
47+
assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
48+
assert.NoError(t, com.CopyDir("../integrations/gitea-repositories-meta", setting.RepoRootPath))
49+
}
50+
4151
type testCond struct {
4252
query interface{}
4353
args []interface{}

0 commit comments

Comments
 (0)