diff options
author | 2024-07-12 09:39:47 +0000 | |
---|---|---|
committer | 2024-07-12 09:39:47 +0000 | |
commit | cde2fb6244a791b3c5b746112e3a8be3a79f39a4 (patch) | |
tree | 6079d6fb66d90ffbe8c1623525bb86829c162459 /internal/httpclient/client_test.go | |
parent | [chore] Add interaction policy gtsmodels (#3075) (diff) | |
download | gotosocial-cde2fb6244a791b3c5b746112e3a8be3a79f39a4.tar.xz |
[feature] support processing of (many) more media types (#3090)
* initial work replacing our media decoding / encoding pipeline with ffprobe + ffmpeg
* specify the video codec to use when generating static image from emoji
* update go-storage library (fixes incompatibility after updating go-iotools)
* maintain image aspect ratio when generating a thumbnail for it
* update readme to show go-ffmpreg
* fix a bunch of media tests, move filesize checking to callers of media manager for more flexibility
* remove extra debug from error message
* fix up incorrect function signatures
* update PutFile to just use regular file copy, as changes are file is on separate partition
* fix remaining tests, remove some unneeded tests now we're working with ffmpeg/ffprobe
* update more tests, add more code comments
* add utilities to generate processed emoji / media outputs
* fix remaining tests
* add test for opus media file, add license header to utility cmds
* limit the number of concurrently available ffmpeg / ffprobe instances
* reduce number of instances
* further reduce number of instances
* fix envparsing test with configuration variables
* update docs and configuration with new media-{local,remote}-max-size variables
Diffstat (limited to 'internal/httpclient/client_test.go')
-rw-r--r-- | internal/httpclient/client_test.go | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/internal/httpclient/client_test.go b/internal/httpclient/client_test.go index f0ec01ec3..2e36a6e90 100644 --- a/internal/httpclient/client_test.go +++ b/internal/httpclient/client_test.go @@ -48,44 +48,19 @@ var bodies = []string{ "body with\r\nnewlines", } -func TestHTTPClientSmallBody(t *testing.T) { +func TestHTTPClientBody(t *testing.T) { for _, body := range bodies { - _TestHTTPClientWithBody(t, []byte(body), int(^uint16(0))) + testHTTPClientWithBody(t, []byte(body)) } } -func TestHTTPClientExactBody(t *testing.T) { - for _, body := range bodies { - _TestHTTPClientWithBody(t, []byte(body), len(body)) - } -} - -func TestHTTPClientLargeBody(t *testing.T) { - for _, body := range bodies { - _TestHTTPClientWithBody(t, []byte(body), len(body)-1) - } -} - -func _TestHTTPClientWithBody(t *testing.T, body []byte, max int) { +func testHTTPClientWithBody(t *testing.T, body []byte) { var ( handler http.HandlerFunc - - expect []byte - - expectErr error ) - // If this is a larger body, reslice and - // set error so we know what to expect - expect = body - if max < len(body) { - expect = expect[:max] - expectErr = httpclient.ErrBodyTooLarge - } - // Create new HTTP client with maximum body size client := httpclient.New(httpclient.Config{ - MaxBodySize: int64(max), DisableCompression: true, AllowRanges: []netip.Prefix{ // Loopback (used by server) @@ -110,10 +85,8 @@ func _TestHTTPClientWithBody(t *testing.T, body []byte, max int) { // Perform the test request rsp, err := client.Do(req) - if !errors.Is(err, expectErr) { + if err != nil { t.Fatalf("error performing client request: %v", err) - } else if err != nil { - return // expected error } defer rsp.Body.Close() @@ -124,8 +97,8 @@ func _TestHTTPClientWithBody(t *testing.T, body []byte, max int) { } // Check actual response body matches expected - if !bytes.Equal(expect, check) { - t.Errorf("response body did not match expected: expect=%q actual=%q", string(expect), string(check)) + if !bytes.Equal(body, check) { + t.Errorf("response body did not match expected: expect=%q actual=%q", string(body), string(check)) } } |