mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 09:02:25 -05:00 
			
		
		
		
	[bugfix] Rework MultiError to wrap + unwrap errors properly (#2057)
* rework multierror a bit * test multierror
This commit is contained in:
		
					parent
					
						
							
								2cee8f2dd8
							
						
					
				
			
			
				commit
				
					
						e8a20f587c
					
				
			
		
					 24 changed files with 263 additions and 154 deletions
				
			
		|  | @ -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{} | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue