domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix "data race" in testlogger (#9159)

Browse source 
* Fix data race in testlogger

* Update git_helper_for_declarative_test.go
This commit is contained in:
zeripath 2019-11-25 23:21:37 +00:00 • committed by Lauris BH
parent f5bd0884d2
commit 055f6d2296
67 changed files with 213 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

8
integrations/api_pull_test.go
View file

@ -19,7 +19,7 @@ import (
)
func TestAPIViewPulls(t *testing.T) {
prepareTestEnv(t)
defer prepareTestEnv(t)()
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
@ -36,7 +36,7 @@ func TestAPIViewPulls(t *testing.T) {
// TestAPIMergePullWIP ensures that we can't merge a WIP pull request
func TestAPIMergePullWIP(t *testing.T) {
prepareTestEnv(t)
defer prepareTestEnv(t)()
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
pr := models.AssertExistsAndLoadBean(t, &models.PullRequest{Status: models.PullRequestStatusMergeable}, models.Cond("has_merged = ?", false)).(*models.PullRequest)
@ -59,7 +59,7 @@ func TestAPIMergePullWIP(t *testing.T) {
}
func TestAPICreatePullSuccess1(t *testing.T) {
prepareTestEnv(t)
defer prepareTestEnv(t)()
repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository)
// repo10 have code, pulls units.
repo11 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 11}).(*models.Repository)
@ -79,7 +79,7 @@ func TestAPICreatePullSuccess1(t *testing.T) {
}
func TestAPICreatePullSuccess2(t *testing.T) {
prepareTestEnv(t)
defer prepareTestEnv(t)()
repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository)
owner10 := models.AssertExistsAndLoadBean(t, &models.User{ID: repo10.OwnerID}).(*models.User)