Skip to content

Commit c98dd7a

Browse files
Gustedzeripathwxiaoguang
authored
Remove unnecessary variable assignments (#17695)
* Remove unnecessary variable assignments As title * enable ineffassign Co-authored-by: zeripath <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
1 parent b01f6c1 commit c98dd7a

32 files changed

+59
-72
lines changed

‎.golangci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ linters:
1515
- misspell
1616
- gocritic
1717
- bidichk
18+
- ineffassign
1819
enable-all: false
1920
disable-all: true
2021
fast: false

‎cmd/hook.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ Gitea or set your environment appropriately.`, "")
293293
}
294294
} else if lastline > 0 {
295295
fmt.Fprintf(out, "\n")
296-
lastline = 0
297296
}
298297

299298
fmt.Fprintf(out, "Checked %d references in total\n", total)

‎contrib/environment-to-ini/environment-to-ini.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ func DecodeSectionKey(encoded string) (string, string) {
224224
if !inKey {
225225
if splitter := strings.Index(remaining, "__"); splitter > -1 {
226226
section += remaining[:splitter]
227-
inKey = true
228227
key += remaining[splitter+2:]
229228
} else {
230229
section += remaining

‎integrations/api_comment_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ func TestAPIGetComment(t *testing.T) {
119119
session := loginUser(t, repoOwner.Name)
120120
token := getTokenForLoggedInUser(t, session)
121121
req := NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d", repoOwner.Name, repo.Name, comment.ID)
122-
resp := session.MakeRequest(t, req, http.StatusOK)
122+
session.MakeRequest(t, req, http.StatusOK)
123123
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/issues/comments/%d?token=%s", repoOwner.Name, repo.Name, comment.ID, token)
124-
resp = session.MakeRequest(t, req, http.StatusOK)
124+
resp := session.MakeRequest(t, req, http.StatusOK)
125125

126126
var apiComment api.Comment
127127
DecodeJSON(t, resp, &apiComment)

‎integrations/api_issue_label_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func TestAPIModifyLabels(t *testing.T) {
8383

8484
//DeleteLabel
8585
req = NewRequest(t, "DELETE", singleURLStr)
86-
resp = session.MakeRequest(t, req, http.StatusNoContent)
86+
session.MakeRequest(t, req, http.StatusNoContent)
8787

8888
}
8989

@@ -203,6 +203,6 @@ func TestAPIModifyOrgLabels(t *testing.T) {
203203

204204
//DeleteLabel
205205
req = NewRequest(t, "DELETE", singleURLStr)
206-
resp = session.MakeRequest(t, req, http.StatusNoContent)
206+
session.MakeRequest(t, req, http.StatusNoContent)
207207

208208
}

‎integrations/api_issue_milestone_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ func TestAPIIssuesMilestone(t *testing.T) {
7474
assert.Equal(t, int64(2), apiMilestones[0].ID)
7575

7676
req = NewRequest(t, "DELETE", fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%d?token=%s", owner.Name, repo.Name, apiMilestone.ID, token))
77-
resp = session.MakeRequest(t, req, http.StatusNoContent)
77+
session.MakeRequest(t, req, http.StatusNoContent)
7878
}

‎integrations/api_issue_reaction_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,24 @@ func TestAPIIssuesReactions(t *testing.T) {
3636
req := NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{
3737
Reaction: "wrong",
3838
})
39-
resp := session.MakeRequest(t, req, http.StatusForbidden)
39+
session.MakeRequest(t, req, http.StatusForbidden)
4040

4141
//Delete not allowed reaction
4242
req = NewRequestWithJSON(t, "DELETE", urlStr, &api.EditReactionOption{
4343
Reaction: "zzz",
4444
})
45-
resp = session.MakeRequest(t, req, http.StatusOK)
45+
session.MakeRequest(t, req, http.StatusOK)
4646

4747
//Add allowed reaction
4848
req = NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{
4949
Reaction: "rocket",
5050
})
51-
resp = session.MakeRequest(t, req, http.StatusCreated)
51+
resp := session.MakeRequest(t, req, http.StatusCreated)
5252
var apiNewReaction api.Reaction
5353
DecodeJSON(t, resp, &apiNewReaction)
5454

5555
//Add existing reaction
56-
resp = session.MakeRequest(t, req, http.StatusForbidden)
56+
session.MakeRequest(t, req, http.StatusForbidden)
5757

5858
//Get end result of reaction list of issue #1
5959
req = NewRequestf(t, "GET", urlStr)
@@ -96,24 +96,24 @@ func TestAPICommentReactions(t *testing.T) {
9696
req := NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{
9797
Reaction: "wrong",
9898
})
99-
resp := session.MakeRequest(t, req, http.StatusForbidden)
99+
session.MakeRequest(t, req, http.StatusForbidden)
100100

101101
//Delete none existing reaction
102102
req = NewRequestWithJSON(t, "DELETE", urlStr, &api.EditReactionOption{
103103
Reaction: "eyes",
104104
})
105-
resp = session.MakeRequest(t, req, http.StatusOK)
105+
session.MakeRequest(t, req, http.StatusOK)
106106

107107
//Add allowed reaction
108108
req = NewRequestWithJSON(t, "POST", urlStr, &api.EditReactionOption{
109109
Reaction: "+1",
110110
})
111-
resp = session.MakeRequest(t, req, http.StatusCreated)
111+
resp := session.MakeRequest(t, req, http.StatusCreated)
112112
var apiNewReaction api.Reaction
113113
DecodeJSON(t, resp, &apiNewReaction)
114114

115115
//Add existing reaction
116-
resp = session.MakeRequest(t, req, http.StatusForbidden)
116+
session.MakeRequest(t, req, http.StatusForbidden)
117117

118118
//Get end result of reaction list of issue #1
119119
req = NewRequestf(t, "GET", urlStr)

‎integrations/api_notification_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func TestAPINotification(t *testing.T) {
6666
// -- GET /notifications/threads/{id} --
6767
// get forbidden
6868
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", 1, token))
69-
resp = session.MakeRequest(t, req, http.StatusForbidden)
69+
session.MakeRequest(t, req, http.StatusForbidden)
7070

7171
// get own
7272
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", thread5.ID, token))
@@ -100,7 +100,7 @@ func TestAPINotification(t *testing.T) {
100100

101101
lastReadAt := "2000-01-01T00%3A50%3A01%2B00%3A00" //946687801 <- only Notification 4 is in this filter ...
102102
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?last_read_at=%s&token=%s", user2.Name, repo1.Name, lastReadAt, token))
103-
resp = session.MakeRequest(t, req, http.StatusResetContent)
103+
session.MakeRequest(t, req, http.StatusResetContent)
104104

105105
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?status-types=unread&token=%s", token))
106106
resp = session.MakeRequest(t, req, http.StatusOK)
@@ -109,7 +109,7 @@ func TestAPINotification(t *testing.T) {
109109

110110
// -- PATCH /notifications/threads/{id} --
111111
req = NewRequest(t, "PATCH", fmt.Sprintf("/api/v1/notifications/threads/%d?token=%s", thread5.ID, token))
112-
resp = session.MakeRequest(t, req, http.StatusResetContent)
112+
session.MakeRequest(t, req, http.StatusResetContent)
113113

114114
assert.Equal(t, models.NotificationStatusUnread, thread5.Status)
115115
thread5 = unittest.AssertExistsAndLoadBean(t, &models.Notification{ID: 5}).(*models.Notification)

‎integrations/api_pull_review_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func TestAPIPullReview(t *testing.T) {
140140
assert.EqualValues(t, "COMMENT", review.State)
141141
assert.EqualValues(t, 0, review.CodeCommentsCount)
142142
req = NewRequestf(t, http.MethodDelete, "/api/v1/repos/%s/%s/pulls/%d/reviews/%d?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, review.ID, token)
143-
resp = session.MakeRequest(t, req, http.StatusNoContent)
143+
session.MakeRequest(t, req, http.StatusNoContent)
144144

145145
// test CreatePullReview Comment without body but with comments
146146
req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/reviews?token=%s", repo.OwnerName, repo.Name, pullIssue.Index, token), &api.CreatePullReviewOptions{

‎integrations/api_repo_edit_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ func TestAPIRepoEdit(t *testing.T) {
145145
// Get user2's token
146146
session := loginUser(t, user2.Name)
147147
token2 := getTokenForLoggedInUser(t, session)
148-
session = emptyTestSession(t)
149148
// Get user4's token
150149
session = loginUser(t, user4.Name)
151150
token4 := getTokenForLoggedInUser(t, session)
@@ -223,15 +222,15 @@ func TestAPIRepoEdit(t *testing.T) {
223222
// Do some tests with invalid URL for external tracker and wiki
224223
repoEditOption.ExternalTracker.ExternalTrackerURL = "htp://www.somewebsite.com"
225224
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption)
226-
resp = session.MakeRequest(t, req, http.StatusUnprocessableEntity)
225+
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
227226
repoEditOption.ExternalTracker.ExternalTrackerURL = "http://www.somewebsite.com"
228227
repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user/{repo}?issue={index}"
229228
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption)
230-
resp = session.MakeRequest(t, req, http.StatusUnprocessableEntity)
229+
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
231230
repoEditOption.ExternalTracker.ExternalTrackerFormat = "http://www.somewebsite.com/{user}/{repo}?issue={index}"
232231
repoEditOption.ExternalUncyclo.ExternalUncycloURL = "htp://www.somewebsite.com"
233232
req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption)
234-
resp = session.MakeRequest(t, req, http.StatusUnprocessableEntity)
233+
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
235234

236235
//Test small repo change through API with issue and wiki option not set; They shall not be touched.
237236
*repoEditOption.Description = "small change"

‎integrations/api_repo_file_create_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ func TestAPICreateFile(t *testing.T) {
149149
// Get user2's token
150150
session := loginUser(t, user2.Name)
151151
token2 := getTokenForLoggedInUser(t, session)
152-
session = emptyTestSession(t)
153152
// Get user4's token
154153
session = loginUser(t, user4.Name)
155154
token4 := getTokenForLoggedInUser(t, session)

‎integrations/api_repo_file_delete_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ func TestAPIDeleteFile(t *testing.T) {
4949
// Get user2's token
5050
session := loginUser(t, user2.Name)
5151
token2 := getTokenForLoggedInUser(t, session)
52-
session = emptyTestSession(t)
5352
// Get user4's token
5453
session = loginUser(t, user4.Name)
5554
token4 := getTokenForLoggedInUser(t, session)
@@ -111,7 +110,7 @@ func TestAPIDeleteFile(t *testing.T) {
111110
deleteFileOptions.SHA = "badsha"
112111
url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2)
113112
req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions)
114-
resp = session.MakeRequest(t, req, http.StatusBadRequest)
113+
session.MakeRequest(t, req, http.StatusBadRequest)
115114

116115
// Test creating a file in repo16 by user4 who does not have write access
117116
fileID++

‎integrations/api_repo_file_update_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ func TestAPIUpdateFile(t *testing.T) {
115115
// Get user2's token
116116
session := loginUser(t, user2.Name)
117117
token2 := getTokenForLoggedInUser(t, session)
118-
session = emptyTestSession(t)
119118
// Get user4's token
120119
session = loginUser(t, user4.Name)
121120
token4 := getTokenForLoggedInUser(t, session)

‎integrations/api_repo_get_contents_list_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
6464
// Get user2's token
6565
session := loginUser(t, user2.Name)
6666
token2 := getTokenForLoggedInUser(t, session)
67-
session = emptyTestSession(t)
6867
// Get user4's token
6968
session = loginUser(t, user4.Name)
7069
token4 := getTokenForLoggedInUser(t, session)
@@ -139,7 +138,7 @@ func testAPIGetContentsList(t *testing.T, u *url.URL) {
139138
// Test file contents a file with a bad ref
140139
ref = "badref"
141140
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?ref=%s", user2.Name, repo1.Name, treePath, ref)
142-
resp = session.MakeRequest(t, req, http.StatusNotFound)
141+
session.MakeRequest(t, req, http.StatusNotFound)
143142

144143
// Test accessing private ref with user token that does not have access - should fail
145144
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token4)

‎integrations/api_repo_get_contents_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
6565
// Get user2's token
6666
session := loginUser(t, user2.Name)
6767
token2 := getTokenForLoggedInUser(t, session)
68-
session = emptyTestSession(t)
6968
// Get user4's token
7069
session = loginUser(t, user4.Name)
7170
token4 := getTokenForLoggedInUser(t, session)
@@ -141,7 +140,7 @@ func testAPIGetContents(t *testing.T, u *url.URL) {
141140
// Test file contents a file with a bad ref
142141
ref = "badref"
143142
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?ref=%s", user2.Name, repo1.Name, treePath, ref)
144-
resp = session.MakeRequest(t, req, http.StatusNotFound)
143+
session.MakeRequest(t, req, http.StatusNotFound)
145144

146145
// Test accessing private ref with user token that does not have access - should fail
147146
req = NewRequestf(t, "GET", "/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo16.Name, treePath, token4)

‎integrations/api_repo_tags_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ func TestAPIRepoTags(t *testing.T) {
6262

6363
// delete tag
6464
delReq := NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/tags/%s?token=%s", user.Name, repoName, newTag.Name, token)
65-
resp = session.MakeRequest(t, delReq, http.StatusNoContent)
65+
session.MakeRequest(t, delReq, http.StatusNoContent)
6666

6767
// check if it's gone
68-
resp = session.MakeRequest(t, req, http.StatusNotFound)
68+
session.MakeRequest(t, req, http.StatusNotFound)
6969
}
7070

7171
func createNewTagUsingAPI(t *testing.T, session *TestSession, token string, ownerName, repoName, name, target, msg string) *api.Tag {

‎integrations/api_repo_teams_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,25 @@ func TestAPIRepoTeams(t *testing.T) {
5454

5555
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "NonExistingTeam", token)
5656
req = NewRequest(t, "GET", url)
57-
res = session.MakeRequest(t, req, http.StatusNotFound)
57+
session.MakeRequest(t, req, http.StatusNotFound)
5858

5959
// AddTeam with user4
6060
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token)
6161
req = NewRequest(t, "PUT", url)
62-
res = session.MakeRequest(t, req, http.StatusForbidden)
62+
session.MakeRequest(t, req, http.StatusForbidden)
6363

6464
// AddTeam with user2
6565
user = unittest.AssertExistsAndLoadBean(t, &models.User{ID: 2}).(*models.User)
6666
session = loginUser(t, user.Name)
6767
token = getTokenForLoggedInUser(t, session)
6868
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token)
6969
req = NewRequest(t, "PUT", url)
70-
res = session.MakeRequest(t, req, http.StatusNoContent)
71-
res = session.MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
70+
session.MakeRequest(t, req, http.StatusNoContent)
71+
session.MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
7272

7373
// DeleteTeam
7474
url = fmt.Sprintf("/api/v1/repos/%s/teams/%s?token=%s", publicOrgRepo.FullName(), "team1", token)
7575
req = NewRequest(t, "DELETE", url)
76-
res = session.MakeRequest(t, req, http.StatusNoContent)
77-
res = session.MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
76+
session.MakeRequest(t, req, http.StatusNoContent)
77+
session.MakeRequest(t, req, http.StatusUnprocessableEntity) // test duplicate request
7878
}

‎integrations/api_repo_topic_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ func TestAPIRepoTopic(t *testing.T) {
7575

7676
// Test delete a topic
7777
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "Topicname1", token2)
78-
res = session.MakeRequest(t, req, http.StatusNoContent)
78+
session.MakeRequest(t, req, http.StatusNoContent)
7979

8080
// Test add an existing topic
8181
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "Golang", token2)
82-
res = session.MakeRequest(t, req, http.StatusNoContent)
82+
session.MakeRequest(t, req, http.StatusNoContent)
8383

8484
// Test add a topic
8585
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "topicName3", token2)
86-
res = session.MakeRequest(t, req, http.StatusNoContent)
86+
session.MakeRequest(t, req, http.StatusNoContent)
8787

8888
// Test read topics using token
8989
req = NewRequest(t, "GET", url)
@@ -96,7 +96,7 @@ func TestAPIRepoTopic(t *testing.T) {
9696
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{
9797
Topics: newTopics,
9898
})
99-
res = session.MakeRequest(t, req, http.StatusNoContent)
99+
session.MakeRequest(t, req, http.StatusNoContent)
100100
req = NewRequest(t, "GET", url)
101101
res = session.MakeRequest(t, req, http.StatusOK)
102102
DecodeJSON(t, res, &topics)
@@ -107,7 +107,7 @@ func TestAPIRepoTopic(t *testing.T) {
107107
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{
108108
Topics: newTopics,
109109
})
110-
res = session.MakeRequest(t, req, http.StatusUnprocessableEntity)
110+
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
111111
req = NewRequest(t, "GET", url)
112112
res = session.MakeRequest(t, req, http.StatusOK)
113113
DecodeJSON(t, res, &topics)
@@ -118,7 +118,7 @@ func TestAPIRepoTopic(t *testing.T) {
118118
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{
119119
Topics: newTopics,
120120
})
121-
res = session.MakeRequest(t, req, http.StatusNoContent)
121+
session.MakeRequest(t, req, http.StatusNoContent)
122122
req = NewRequest(t, "GET", url)
123123
res = session.MakeRequest(t, req, http.StatusOK)
124124
DecodeJSON(t, res, &topics)
@@ -129,15 +129,15 @@ func TestAPIRepoTopic(t *testing.T) {
129129
req = NewRequestWithJSON(t, "PUT", url, &api.RepoTopicOptions{
130130
Topics: newTopics,
131131
})
132-
res = session.MakeRequest(t, req, http.StatusUnprocessableEntity)
132+
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
133133

134134
// Test add a topic when there is already maximum
135135
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "t26", token2)
136-
res = session.MakeRequest(t, req, http.StatusUnprocessableEntity)
136+
session.MakeRequest(t, req, http.StatusUnprocessableEntity)
137137

138138
// Test delete a topic that repo doesn't have
139139
req = NewRequestf(t, "DELETE", "/api/v1/repos/%s/%s/topics/%s?token=%s", user2.Name, repo2.Name, "Topicname1", token2)
140-
res = session.MakeRequest(t, req, http.StatusNotFound)
140+
session.MakeRequest(t, req, http.StatusNotFound)
141141

142142
// Get user4's token
143143
session = loginUser(t, user4.Name)
@@ -153,6 +153,6 @@ func TestAPIRepoTopic(t *testing.T) {
153153

154154
// Test add a topic to repo with write access (requires repo admin access)
155155
req = NewRequestf(t, "PUT", "/api/v1/repos/%s/%s/topics/%s?token=%s", user3.Name, repo3.Name, "topicName", token4)
156-
res = session.MakeRequest(t, req, http.StatusForbidden)
156+
session.MakeRequest(t, req, http.StatusForbidden)
157157

158158
}

‎integrations/api_team_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,6 @@ func TestAPITeamSearch(t *testing.T) {
160160
csrf = GetCSRF(t, session, "/"+org.Name)
161161
req = NewRequestf(t, "GET", "/api/v1/orgs/%s/teams/search?q=%s", org.Name, "team")
162162
req.Header.Add("X-Csrf-Token", csrf)
163-
resp = session.MakeRequest(t, req, http.StatusForbidden)
163+
session.MakeRequest(t, req, http.StatusForbidden)
164164

165165
}

‎integrations/api_user_orgs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,13 @@ func TestMyOrgs(t *testing.T) {
7272

7373
session := emptyTestSession(t)
7474
req := NewRequest(t, "GET", "/api/v1/user/orgs")
75-
resp := session.MakeRequest(t, req, http.StatusUnauthorized)
75+
session.MakeRequest(t, req, http.StatusUnauthorized)
7676

7777
normalUsername := "user2"
7878
session = loginUser(t, normalUsername)
7979
token := getTokenForLoggedInUser(t, session)
8080
req = NewRequest(t, "GET", "/api/v1/user/orgs?token="+token)
81-
resp = session.MakeRequest(t, req, http.StatusOK)
81+
resp := session.MakeRequest(t, req, http.StatusOK)
8282
var orgs []*api.Organization
8383
DecodeJSON(t, resp, &orgs)
8484
user3 := unittest.AssertExistsAndLoadBean(t, &models.User{Name: "user3"}).(*models.User)

‎integrations/eventsource_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func TestEventSourceManagerRun(t *testing.T) {
6969

7070
lastReadAt := "2000-01-01T00%3A50%3A01%2B00%3A00" //946687801 <- only Notification 4 is in this filter ...
7171
req = NewRequest(t, "PUT", fmt.Sprintf("/api/v1/repos/%s/%s/notifications?last_read_at=%s&token=%s", user2.Name, repo1.Name, lastReadAt, token))
72-
resp = session.MakeRequest(t, req, http.StatusResetContent)
72+
session.MakeRequest(t, req, http.StatusResetContent)
7373

7474
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/notifications?token=%s&status-types=unread", token))
7575
resp = session.MakeRequest(t, req, http.StatusOK)

0 commit comments

Comments
 (0)