diff options
Diffstat (limited to 'internal/api/client/statuses')
| -rw-r--r-- | internal/api/client/statuses/statuspin_test.go | 15 | ||||
| -rw-r--r-- | internal/api/client/statuses/statusunpin_test.go | 15 |
2 files changed, 14 insertions, 16 deletions
diff --git a/internal/api/client/statuses/statuspin_test.go b/internal/api/client/statuses/statuspin_test.go index 66ad1a2ee..c7ed6e95d 100644 --- a/internal/api/client/statuses/statuspin_test.go +++ b/internal/api/client/statuses/statuspin_test.go @@ -20,7 +20,6 @@ package statuses_test import ( "context" "encoding/json" - "fmt" "io/ioutil" "net/http" "net/http/httptest" @@ -74,20 +73,20 @@ func (suite *StatusPinTestSuite) createPin( return nil, err } - errs := gtserror.MultiError{} + errs := gtserror.NewMultiError(2) - // check code + body + // Check expected 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 we got an expected body, return early. if expectedBody != "" && string(b) != expectedBody { - errs = append(errs, fmt.Sprintf("expected %s got %s", expectedBody, string(b))) + errs.Appendf("expected %s got %s", expectedBody, string(b)) } - if len(errs) > 0 { - return nil, errs.Combine() + if err := errs.Combine(); err != nil { + suite.FailNow("", "%v (body %s)", err, string(b)) } resp := &apimodel.Status{} diff --git a/internal/api/client/statuses/statusunpin_test.go b/internal/api/client/statuses/statusunpin_test.go index bc68a2ca3..9f6602b98 100644 --- a/internal/api/client/statuses/statusunpin_test.go +++ b/internal/api/client/statuses/statusunpin_test.go @@ -19,7 +19,6 @@ package statuses_test import ( "encoding/json" - "fmt" "io/ioutil" "net/http" "net/http/httptest" @@ -68,20 +67,20 @@ func (suite *StatusUnpinTestSuite) createUnpin( return nil, err } - errs := gtserror.MultiError{} + errs := gtserror.NewMultiError(2) - // check code + body + // Check expected 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 we got an expected body, return early. if expectedBody != "" && string(b) != expectedBody { - errs = append(errs, fmt.Sprintf("expected %s got %s", expectedBody, string(b))) + errs.Appendf("expected %s got %s", expectedBody, string(b)) } - if len(errs) > 0 { - return nil, errs.Combine() + if err := errs.Combine(); err != nil { + suite.FailNow("", "%v (body %s)", err, string(b)) } resp := &apimodel.Status{} |