From 12a098920c03d147959516fda59a6dd6fe474a3c Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 22 Jul 2019 09:11:16 +0200 Subject: [PATCH] Fixed ineffectual assignments in tests (#7553) Just makes it a bit more obvious which values we want to test for, and which ones we want to ignore. --- integrations/api_repo_edit_test.go | 16 ++++++++-------- integrations/api_team_test.go | 4 ++-- models/access_test.go | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/integrations/api_repo_edit_test.go b/integrations/api_repo_edit_test.go index 3b2c916ab0..1231201b97 100644 --- a/integrations/api_repo_edit_test.go +++ b/integrations/api_repo_edit_test.go @@ -146,13 +146,13 @@ func TestAPIRepoEdit(t *testing.T) { // reset repo in db url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, *repoEditOption.Name, token2) req = NewRequestWithJSON(t, "PATCH", url, &origRepoEditOption) - resp = session.MakeRequest(t, req, http.StatusOK) + _ = session.MakeRequest(t, req, http.StatusOK) // Test editing a non-existing repo name := "repodoesnotexist" url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, name, token2) req = NewRequestWithJSON(t, "PATCH", url, &api.EditRepoOption{Name: &name}) - resp = session.MakeRequest(t, req, http.StatusNotFound) + _ = session.MakeRequest(t, req, http.StatusNotFound) // Test editing repo16 by user4 who does not have write access origRepoEditOption = getRepoEditOptionFromRepo(repo16) @@ -166,18 +166,18 @@ func TestAPIRepoEdit(t *testing.T) { repoEditOption = getNewRepoEditOption(origRepoEditOption) url = fmt.Sprintf("/api/v1/repos/%s/%s", user2.Name, repo16.Name) req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) - resp = session.MakeRequest(t, req, http.StatusNotFound) + _ = session.MakeRequest(t, req, http.StatusNotFound) // Test using access token for a private repo that the user of the token owns origRepoEditOption = getRepoEditOptionFromRepo(repo16) repoEditOption = getNewRepoEditOption(origRepoEditOption) url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo16.Name, token2) req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) - resp = session.MakeRequest(t, req, http.StatusOK) + _ = session.MakeRequest(t, req, http.StatusOK) // reset repo in db url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, *repoEditOption.Name, token2) req = NewRequestWithJSON(t, "PATCH", url, &origRepoEditOption) - resp = session.MakeRequest(t, req, http.StatusOK) + _ = session.MakeRequest(t, req, http.StatusOK) // Test making a repo public that is private repo16 = models.AssertExistsAndLoadBean(t, &models.Repository{ID: 16}).(*models.Repository) @@ -188,14 +188,14 @@ func TestAPIRepoEdit(t *testing.T) { } url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user2.Name, repo16.Name, token2) req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) - resp = session.MakeRequest(t, req, http.StatusOK) + _ = session.MakeRequest(t, req, http.StatusOK) repo16 = models.AssertExistsAndLoadBean(t, &models.Repository{ID: 16}).(*models.Repository) assert.False(t, repo16.IsPrivate) // Make it private again private = true repoEditOption.Private = &private req = NewRequestWithJSON(t, "PATCH", url, &repoEditOption) - resp = session.MakeRequest(t, req, http.StatusOK) + _ = session.MakeRequest(t, req, http.StatusOK) // Test using org repo "user3/repo3" where user2 is a collaborator origRepoEditOption = getRepoEditOptionFromRepo(repo3) @@ -206,7 +206,7 @@ func TestAPIRepoEdit(t *testing.T) { // reset repo in db url = fmt.Sprintf("/api/v1/repos/%s/%s?token=%s", user3.Name, *repoEditOption.Name, token2) req = NewRequestWithJSON(t, "PATCH", url, &origRepoEditOption) - resp = session.MakeRequest(t, req, http.StatusOK) + _ = session.MakeRequest(t, req, http.StatusOK) // Test using org repo "user3/repo3" with no user token origRepoEditOption = getRepoEditOptionFromRepo(repo3) diff --git a/integrations/api_team_test.go b/integrations/api_team_test.go index a884085f5c..a7c22d6ba1 100644 --- a/integrations/api_team_test.go +++ b/integrations/api_team_test.go @@ -41,10 +41,10 @@ func TestAPITeam(t *testing.T) { session = loginUser(t, user2.Name) token = getTokenForLoggedInUser(t, session) req = NewRequestf(t, "GET", "/api/v1/teams/%d?token="+token, teamUser.TeamID) - resp = session.MakeRequest(t, req, http.StatusForbidden) + _ = session.MakeRequest(t, req, http.StatusForbidden) req = NewRequestf(t, "GET", "/api/v1/teams/%d", teamUser.TeamID) - resp = session.MakeRequest(t, req, http.StatusUnauthorized) + _ = session.MakeRequest(t, req, http.StatusUnauthorized) // Get an admin user able to create, update and delete teams. user = models.AssertExistsAndLoadBean(t, &models.User{ID: 1}).(*models.User) diff --git a/models/access_test.go b/models/access_test.go index db6f655a67..d0f0032547 100644 --- a/models/access_test.go +++ b/models/access_test.go @@ -55,13 +55,13 @@ func TestHasAccess(t *testing.T) { assert.NoError(t, err) assert.True(t, has) - has, err = HasAccess(user1.ID, repo2) + _, err = HasAccess(user1.ID, repo2) assert.NoError(t, err) - has, err = HasAccess(user2.ID, repo1) + _, err = HasAccess(user2.ID, repo1) assert.NoError(t, err) - has, err = HasAccess(user2.ID, repo2) + _, err = HasAccess(user2.ID, repo2) assert.NoError(t, err) }