From 27b4fdd9865e21445102ccbb1e8f873a1ec73ad5 Mon Sep 17 00:00:00 2001 From: 6543 <6543@noreply.gitea.io> Date: Wed, 8 Jul 2020 17:21:40 +0000 Subject: [PATCH] Impruve Error Handling (#351) ajust test for new gitea responce dedub Merge branch 'master' into impruve-error-handling Merge branch 'master' into impruve-error-handling Merge branch 'master' into impruve-error-handling if 500 error has ErrMsg return this else return request witch was made Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://gitea.com/gitea/go-sdk/pulls/351 Reviewed-by: Andrew Thornton Reviewed-by: John Olheiser --- gitea/client.go | 4 +--- gitea/repo_commit_test.go | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gitea/client.go b/gitea/client.go index ac8109d..ccbe10e 100644 --- a/gitea/client.go +++ b/gitea/client.go @@ -119,8 +119,6 @@ func (c *Client) getResponse(method, path string, header http.Header, body io.Re return nil, errors.New("409 Conflict") case 422: return nil, fmt.Errorf("422 Unprocessable Entity: %s", string(data)) - case 500: - return nil, fmt.Errorf("500 Internal Server Error, request: '%s' with '%s' method and '%s' header", path, method, header) } if resp.StatusCode/100 != 2 { @@ -128,7 +126,7 @@ func (c *Client) getResponse(method, path string, header http.Header, body io.Re if err = json.Unmarshal(data, &errMap); err != nil { // when the JSON can't be parsed, data was probably empty or a plain string, // so we try to return a helpful error anyway - return nil, fmt.Errorf("Unknown API Error: %d %s", resp.StatusCode, string(data)) + return nil, fmt.Errorf("Unknown API Error: %d\nRequest: '%s' with '%s' method '%s' header and '%s' body", resp.StatusCode, path, method, header, string(data)) } return nil, errors.New(errMap["message"].(string)) } diff --git a/gitea/repo_commit_test.go b/gitea/repo_commit_test.go index a339ad7..9132e15 100644 --- a/gitea/repo_commit_test.go +++ b/gitea/repo_commit_test.go @@ -21,5 +21,5 @@ func TestListRepoCommits(t *testing.T) { l, err := c.ListRepoCommits(repo.Owner.UserName, repo.Name, ListCommitOptions{}) assert.NoError(t, err) assert.Len(t, l, 1) - assert.EqualValues(t, "Initial commit", l[0].RepoCommit.Message) + assert.EqualValues(t, "Initial commit\n", l[0].RepoCommit.Message) }