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/pull_merge_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/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index a63e27e149..218f0e4da6 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -105,7 +105,7 @@ func TestPullRebase(t *testing.T) { func TestPullRebaseMerge(t *testing.T) { onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - prepareTestEnv(t) + defer prepareTestEnv(t)() hookTasks, err := models.HookTasks(1, 1) //Retrieve previous hook number assert.NoError(t, err) @@ -129,7 +129,7 @@ func TestPullRebaseMerge(t *testing.T) { func TestPullSquash(t *testing.T) { onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - prepareTestEnv(t) + defer prepareTestEnv(t)() hookTasks, err := models.HookTasks(1, 1) //Retrieve previous hook number assert.NoError(t, err) @@ -154,7 +154,7 @@ func TestPullSquash(t *testing.T) { func TestPullCleanUpAfterMerge(t *testing.T) { onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - prepareTestEnv(t) + defer prepareTestEnv(t)() session := loginUser(t, "user1") testRepoFork(t, session, "user2", "repo1", "user1", "repo1") testEditFileToNewBranch(t, session, "user1", "repo1", "master", "feature/test", "README.md", "Hello, World (Edited)\n") @@ -190,7 +190,7 @@ func TestPullCleanUpAfterMerge(t *testing.T) { func TestCantMergeWorkInProgress(t *testing.T) { onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - prepareTestEnv(t) + defer prepareTestEnv(t)() session := loginUser(t, "user1") testRepoFork(t, session, "user2", "repo1", "user1", "repo1") testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n") @@ -212,7 +212,7 @@ func TestCantMergeWorkInProgress(t *testing.T) { func TestCantMergeConflict(t *testing.T) { onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - prepareTestEnv(t) + defer prepareTestEnv(t)() session := loginUser(t, "user1") testRepoFork(t, session, "user2", "repo1", "user1", "repo1") testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n") @@ -258,7 +258,7 @@ func TestCantMergeConflict(t *testing.T) { func TestCantMergeUnrelated(t *testing.T) { onGiteaRun(t, func(t *testing.T, giteaURL *url.URL) { - prepareTestEnv(t) + defer prepareTestEnv(t)() session := loginUser(t, "user1") testRepoFork(t, session, "user2", "repo1", "user1", "repo1") testEditFileToNewBranch(t, session, "user1", "repo1", "master", "base", "README.md", "Hello, World (Edited Twice)\n") |