From e8a20f587c0b0129bc68f5c6092c54f2b4c3519a Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 2 Aug 2023 17:21:46 +0200
Subject: [bugfix] Rework MultiError to wrap + unwrap errors properly (#2057)

* rework multierror a bit

* test multierror
---
 internal/api/client/statuses/statuspin_test.go | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'internal/api/client/statuses/statuspin_test.go')

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{}
-- 
cgit v1.2.3