diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-08-02 17:21:46 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-08-02 17:21:46 +0200 |
| commit | e8a20f587c0b0129bc68f5c6092c54f2b4c3519a (patch) | |
| tree | 3677b4abec2cabf3b5042115ba76505daf5fddf3 /internal/api/client/reports | |
| parent | [bugfix] fix slow accounts / statuses using emojis lookups (#2056) (diff) | |
| download | gotosocial-e8a20f587c0b0129bc68f5c6092c54f2b4c3519a.tar.xz | |
[bugfix] Rework MultiError to wrap + unwrap errors properly (#2057)
* rework multierror a bit
* test multierror
Diffstat (limited to 'internal/api/client/reports')
| -rw-r--r-- | internal/api/client/reports/reportcreate_test.go | 7 | ||||
| -rw-r--r-- | internal/api/client/reports/reportget_test.go | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/internal/api/client/reports/reportcreate_test.go b/internal/api/client/reports/reportcreate_test.go index 672a7a63b..e17695cb9 100644 --- a/internal/api/client/reports/reportcreate_test.go +++ b/internal/api/client/reports/reportcreate_test.go @@ -19,7 +19,6 @@ package reports_test import ( "encoding/json" - "fmt" "io/ioutil" "net/http" "net/http/httptest" @@ -77,17 +76,17 @@ func (suite *ReportCreateTestSuite) createReport(expectedHTTPStatus int, expecte return nil, err } - errs := gtserror.MultiError{} + errs := gtserror.NewMultiError(2) // check code + body if resultCode := recorder.Code; expectedHTTPStatus != resultCode { - errs = append(errs, fmt.Sprintf("expected %d got %d", expectedHTTPStatus, resultCode)) + errs.Appendf("expected %d got %d", expectedHTTPStatus, resultCode) } // if we got an expected body, return early if expectedBody != "" { if string(b) != expectedBody { - errs = append(errs, fmt.Sprintf("expected %s got %s", expectedBody, string(b))) + errs.Appendf("expected %s got %s", expectedBody, string(b)) } return nil, errs.Combine() } diff --git a/internal/api/client/reports/reportget_test.go b/internal/api/client/reports/reportget_test.go index b3de34053..e29836b6a 100644 --- a/internal/api/client/reports/reportget_test.go +++ b/internal/api/client/reports/reportget_test.go @@ -19,7 +19,6 @@ package reports_test import ( "encoding/json" - "fmt" "io/ioutil" "net/http" "net/http/httptest" @@ -64,17 +63,17 @@ func (suite *ReportGetTestSuite) getReport(expectedHTTPStatus int, expectedBody return nil, err } - errs := gtserror.MultiError{} + errs := gtserror.NewMultiError(2) // check code + body if resultCode := recorder.Code; expectedHTTPStatus != resultCode { - errs = append(errs, fmt.Sprintf("expected %d got %d", expectedHTTPStatus, resultCode)) + errs.Appendf("expected %d got %d", expectedHTTPStatus, resultCode) } // if we got an expected body, return early if expectedBody != "" { if string(b) != expectedBody { - errs = append(errs, fmt.Sprintf("expected %s got %s", expectedBody, string(b))) + errs.Appendf("expected %s got %s", expectedBody, string(b)) } return nil, errs.Combine() } |