diff options
| author | zeripath <art27@cantab.net> | 2019-11-25 23:21:37 +0000 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-11-26 01:21:37 +0200 |
| commit | 055f6d229672524e3933940f95aa28939d94961a (patch) | |
| tree | 72d1d427ce694517b70b6b751e35fdf6d5874428 /integrations/api_pull_test.go | |
| parent | f5bd0884d2adea8ef7ba1bbd9dacb240d7c6b0f7 (diff) | |
| download | gitea-055f6d229672524e3933940f95aa28939d94961a.tar.gz gitea-055f6d229672524e3933940f95aa28939d94961a.zip | |
Fix "data race" in testlogger (#9159)
* Fix data race in testlogger
* Update git_helper_for_declarative_test.go
Diffstat (limited to 'integrations/api_pull_test.go')
| -rw-r--r-- | integrations/api_pull_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/integrations/api_pull_test.go b/integrations/api_pull_test.go index ed5a55a9db..9e22be5755 100644 --- a/integrations/api_pull_test.go +++ b/integrations/api_pull_test.go @@ -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) |