Skip to content

Commit 055f6d2

Browse files
zeripathlafriks
zeripath
authored and
lafriks
committed
Fix "data race" in testlogger (#9159)
* Fix data race in testlogger * Update git_helper_for_declarative_test.go
1 parent f5bd088 commit 055f6d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+213
-200
lines changed

‎integrations/api_admin_org_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestAPIAdminOrgCreateBadVisibility(t *testing.T) {
6969
}
7070

7171
func TestAPIAdminOrgCreateNotAdmin(t *testing.T) {
72-
prepareTestEnv(t)
72+
defer prepareTestEnv(t)()
7373
nonAdminUsername := "user2"
7474
session := loginUser(t, nonAdminUsername)
7575
token := getTokenForLoggedInUser(t, session)

‎integrations/api_admin_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
19-
prepareTestEnv(t)
19+
defer prepareTestEnv(t)()
2020
// user1 is an admin user
2121
session := loginUser(t, "user1")
2222
keyOwner := models.AssertExistsAndLoadBean(t, &models.User{Name: "user2"}).(*models.User)
@@ -46,7 +46,7 @@ func TestAPIAdminCreateAndDeleteSSHKey(t *testing.T) {
4646
}
4747

4848
func TestAPIAdminDeleteMissingSSHKey(t *testing.T) {
49-
prepareTestEnv(t)
49+
defer prepareTestEnv(t)()
5050
// user1 is an admin user
5151
session := loginUser(t, "user1")
5252

@@ -56,7 +56,7 @@ func TestAPIAdminDeleteMissingSSHKey(t *testing.T) {
5656
}
5757

5858
func TestAPIAdminDeleteUnauthorizedKey(t *testing.T) {
59-
prepareTestEnv(t)
59+
defer prepareTestEnv(t)()
6060
adminUsername := "user1"
6161
normalUsername := "user2"
6262
session := loginUser(t, adminUsername)
@@ -79,7 +79,7 @@ func TestAPIAdminDeleteUnauthorizedKey(t *testing.T) {
7979
}
8080

8181
func TestAPISudoUser(t *testing.T) {
82-
prepareTestEnv(t)
82+
defer prepareTestEnv(t)()
8383
adminUsername := "user1"
8484
normalUsername := "user2"
8585
session := loginUser(t, adminUsername)
@@ -95,7 +95,7 @@ func TestAPISudoUser(t *testing.T) {
9595
}
9696

9797
func TestAPISudoUserForbidden(t *testing.T) {
98-
prepareTestEnv(t)
98+
defer prepareTestEnv(t)()
9999
adminUsername := "user1"
100100
normalUsername := "user2"
101101

@@ -108,7 +108,7 @@ func TestAPISudoUserForbidden(t *testing.T) {
108108
}
109109

110110
func TestAPIListUsers(t *testing.T) {
111-
prepareTestEnv(t)
111+
defer prepareTestEnv(t)()
112112
adminUsername := "user1"
113113
session := loginUser(t, adminUsername)
114114
token := getTokenForLoggedInUser(t, session)
@@ -131,13 +131,13 @@ func TestAPIListUsers(t *testing.T) {
131131
}
132132

133133
func TestAPIListUsersNotLoggedIn(t *testing.T) {
134-
prepareTestEnv(t)
134+
defer prepareTestEnv(t)()
135135
req := NewRequest(t, "GET", "/api/v1/admin/users")
136136
MakeRequest(t, req, http.StatusUnauthorized)
137137
}
138138

139139
func TestAPIListUsersNonAdmin(t *testing.T) {
140-
prepareTestEnv(t)
140+
defer prepareTestEnv(t)()
141141
nonAdminUsername := "user2"
142142
session := loginUser(t, nonAdminUsername)
143143
token := getTokenForLoggedInUser(t, session)

‎integrations/api_branch_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
func testAPIGetBranch(t *testing.T, branchName string, exists bool) {
17-
prepareTestEnv(t)
17+
defer prepareTestEnv(t)()
1818

1919
session := loginUser(t, "user2")
2020
token := getTokenForLoggedInUser(t, session)

‎integrations/api_comment_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
func TestAPIListRepoComments(t *testing.T) {
19-
prepareTestEnv(t)
19+
defer prepareTestEnv(t)()
2020

2121
comment := models.AssertExistsAndLoadBean(t, &models.Comment{},
2222
models.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
@@ -40,7 +40,7 @@ func TestAPIListRepoComments(t *testing.T) {
4040
}
4141

4242
func TestAPIListIssueComments(t *testing.T) {
43-
prepareTestEnv(t)
43+
defer prepareTestEnv(t)()
4444

4545
comment := models.AssertExistsAndLoadBean(t, &models.Comment{},
4646
models.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)
@@ -61,7 +61,7 @@ func TestAPIListIssueComments(t *testing.T) {
6161
}
6262

6363
func TestAPICreateComment(t *testing.T) {
64-
prepareTestEnv(t)
64+
defer prepareTestEnv(t)()
6565
const commentBody = "Comment body"
6666

6767
issue := models.AssertExistsAndLoadBean(t, &models.Issue{}).(*models.Issue)
@@ -84,7 +84,7 @@ func TestAPICreateComment(t *testing.T) {
8484
}
8585

8686
func TestAPIEditComment(t *testing.T) {
87-
prepareTestEnv(t)
87+
defer prepareTestEnv(t)()
8888
const newCommentBody = "This is the new comment body"
8989

9090
comment := models.AssertExistsAndLoadBean(t, &models.Comment{},
@@ -110,7 +110,7 @@ func TestAPIEditComment(t *testing.T) {
110110
}
111111

112112
func TestAPIDeleteComment(t *testing.T) {
113-
prepareTestEnv(t)
113+
defer prepareTestEnv(t)()
114114

115115
comment := models.AssertExistsAndLoadBean(t, &models.Comment{},
116116
models.Cond("type = ?", models.CommentTypeComment)).(*models.Comment)

‎integrations/api_fork_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
func TestCreateForkNoLogin(t *testing.T) {
15-
prepareTestEnv(t)
15+
defer prepareTestEnv(t)()
1616
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/forks", &api.CreateForkOption{})
1717
MakeRequest(t, req, http.StatusUnauthorized)
1818
}

‎integrations/api_gpg_keys_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
type makeRequestFunc func(testing.TB, *http.Request, int) *httptest.ResponseRecorder
1919

2020
func TestGPGKeys(t *testing.T) {
21-
prepareTestEnv(t)
21+
defer prepareTestEnv(t)()
2222
session := loginUser(t, "user2")
2323
token := getTokenForLoggedInUser(t, session)
2424

‎integrations/api_issue_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
func TestAPIListIssues(t *testing.T) {
19-
prepareTestEnv(t)
19+
defer prepareTestEnv(t)()
2020

2121
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
2222
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
@@ -35,7 +35,7 @@ func TestAPIListIssues(t *testing.T) {
3535
}
3636

3737
func TestAPICreateIssue(t *testing.T) {
38-
prepareTestEnv(t)
38+
defer prepareTestEnv(t)()
3939
const body, title = "apiTestBody", "apiTestTitle"
4040

4141
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)

‎integrations/api_keys_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ import (
1717
)
1818

1919
func TestViewDeployKeysNoLogin(t *testing.T) {
20-
prepareTestEnv(t)
20+
defer prepareTestEnv(t)()
2121
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/keys")
2222
MakeRequest(t, req, http.StatusUnauthorized)
2323
}
2424

2525
func TestCreateDeployKeyNoLogin(t *testing.T) {
26-
prepareTestEnv(t)
26+
defer prepareTestEnv(t)()
2727
req := NewRequestWithJSON(t, "POST", "/api/v1/repos/user2/repo1/keys", api.CreateKeyOption{
2828
Title: "title",
2929
Key: "key",
@@ -32,19 +32,19 @@ func TestCreateDeployKeyNoLogin(t *testing.T) {
3232
}
3333

3434
func TestGetDeployKeyNoLogin(t *testing.T) {
35-
prepareTestEnv(t)
35+
defer prepareTestEnv(t)()
3636
req := NewRequest(t, "GET", "/api/v1/repos/user2/repo1/keys/1")
3737
MakeRequest(t, req, http.StatusUnauthorized)
3838
}
3939

4040
func TestDeleteDeployKeyNoLogin(t *testing.T) {
41-
prepareTestEnv(t)
41+
defer prepareTestEnv(t)()
4242
req := NewRequest(t, "DELETE", "/api/v1/repos/user2/repo1/keys/1")
4343
MakeRequest(t, req, http.StatusUnauthorized)
4444
}
4545

4646
func TestCreateReadOnlyDeployKey(t *testing.T) {
47-
prepareTestEnv(t)
47+
defer prepareTestEnv(t)()
4848
repo := models.AssertExistsAndLoadBean(t, &models.Repository{Name: "repo1"}).(*models.Repository)
4949
repoOwner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
5050

@@ -70,7 +70,7 @@ func TestCreateReadOnlyDeployKey(t *testing.T) {
7070
}
7171

7272
func TestCreateReadWriteDeployKey(t *testing.T) {
73-
prepareTestEnv(t)
73+
defer prepareTestEnv(t)()
7474
repo := models.AssertExistsAndLoadBean(t, &models.Repository{Name: "repo1"}).(*models.Repository)
7575
repoOwner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
7676

@@ -95,7 +95,7 @@ func TestCreateReadWriteDeployKey(t *testing.T) {
9595
}
9696

9797
func TestCreateUserKey(t *testing.T) {
98-
prepareTestEnv(t)
98+
defer prepareTestEnv(t)()
9999
user := models.AssertExistsAndLoadBean(t, &models.User{Name: "user1"}).(*models.User)
100100

101101
session := loginUser(t, "user1")

‎integrations/api_pull_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
)
2020

2121
func TestAPIViewPulls(t *testing.T) {
22-
prepareTestEnv(t)
22+
defer prepareTestEnv(t)()
2323
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
2424
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
2525

@@ -36,7 +36,7 @@ func TestAPIViewPulls(t *testing.T) {
3636

3737
// TestAPIMergePullWIP ensures that we can't merge a WIP pull request
3838
func TestAPIMergePullWIP(t *testing.T) {
39-
prepareTestEnv(t)
39+
defer prepareTestEnv(t)()
4040
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
4141
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
4242
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) {
5959
}
6060

6161
func TestAPICreatePullSuccess1(t *testing.T) {
62-
prepareTestEnv(t)
62+
defer prepareTestEnv(t)()
6363
repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository)
6464
// repo10 have code, pulls units.
6565
repo11 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 11}).(*models.Repository)
@@ -79,7 +79,7 @@ func TestAPICreatePullSuccess1(t *testing.T) {
7979
}
8080

8181
func TestAPICreatePullSuccess2(t *testing.T) {
82-
prepareTestEnv(t)
82+
defer prepareTestEnv(t)()
8383
repo10 := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 10}).(*models.Repository)
8484
owner10 := models.AssertExistsAndLoadBean(t, &models.User{ID: repo10.OwnerID}).(*models.User)
8585

‎integrations/api_releases_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func createNewReleaseUsingAPI(t *testing.T, session *TestSession, token string,
4242
}
4343

4444
func TestAPICreateAndUpdateRelease(t *testing.T) {
45-
prepareTestEnv(t)
45+
defer prepareTestEnv(t)()
4646

4747
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
4848
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
@@ -93,7 +93,7 @@ func TestAPICreateAndUpdateRelease(t *testing.T) {
9393
}
9494

9595
func TestAPICreateReleaseToDefaultBranch(t *testing.T) {
96-
prepareTestEnv(t)
96+
defer prepareTestEnv(t)()
9797

9898
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
9999
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)
@@ -104,7 +104,7 @@ func TestAPICreateReleaseToDefaultBranch(t *testing.T) {
104104
}
105105

106106
func TestAPICreateReleaseToDefaultBranchOnExistingTag(t *testing.T) {
107-
prepareTestEnv(t)
107+
defer prepareTestEnv(t)()
108108

109109
repo := models.AssertExistsAndLoadBean(t, &models.Repository{ID: 1}).(*models.Repository)
110110
owner := models.AssertExistsAndLoadBean(t, &models.User{ID: repo.OwnerID}).(*models.User)

‎integrations/api_repo_git_blobs_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
)
1616

1717
func TestAPIReposGitBlobs(t *testing.T) {
18-
prepareTestEnv(t)
18+
defer prepareTestEnv(t)()
1919
user2 := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User) // owner of the repo1 & repo16
2020
user3 := models.AssertExistsAndLoadBean(t, &models.User{ID: 3}).(*models.User) // owner of the repo3
2121
user4 := models.AssertExistsAndLoadBean(t, &models.User{ID: 4}).(*models.User) // owner of neither repos

‎integrations/api_repo_git_commits_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
)
1616

1717
func TestAPIReposGitCommits(t *testing.T) {
18-
prepareTestEnv(t)
18+
defer prepareTestEnv(t)()
1919
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
2020
// Login as User2.
2121
session := loginUser(t, user.Name)
@@ -35,7 +35,7 @@ func TestAPIReposGitCommits(t *testing.T) {
3535
}
3636

3737
func TestAPIReposGitCommitList(t *testing.T) {
38-
prepareTestEnv(t)
38+
defer prepareTestEnv(t)()
3939
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
4040
// Login as User2.
4141
session := loginUser(t, user.Name)
@@ -55,7 +55,7 @@ func TestAPIReposGitCommitList(t *testing.T) {
5555
}
5656

5757
func TestAPIReposGitCommitListPage2Empty(t *testing.T) {
58-
prepareTestEnv(t)
58+
defer prepareTestEnv(t)()
5959
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
6060
// Login as User2.
6161
session := loginUser(t, user.Name)
@@ -72,7 +72,7 @@ func TestAPIReposGitCommitListPage2Empty(t *testing.T) {
7272
}
7373

7474
func TestAPIReposGitCommitListDifferentBranch(t *testing.T) {
75-
prepareTestEnv(t)
75+
defer prepareTestEnv(t)()
7676
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
7777
// Login as User2.
7878
session := loginUser(t, user.Name)

0 commit comments

Comments
 (0)