Skip to content

Commit 31bb808

Browse files
authored
Return error from WriteFilesToStream (#61)
1 parent e45c025 commit 31bb808

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

http/filestream/filestream.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ func WriteFilesToStream(multipartWriter *multipart.Writer, filesList []*FileInfo
7373
defer ioutils.Close(multipartWriter, &err)
7474
for _, file := range filesList {
7575
if err = writeFile(multipartWriter, file); err != nil {
76-
return writeErr(multipartWriter, file, err)
76+
// Returning the error from writeFile with a possible error from the writeErr function
77+
return errors.Join(err, writeErr(multipartWriter, file, err))
7778
}
7879
}
7980

http/filestream/filestream_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func TestWriteFilesToStreamWithError(t *testing.T) {
5959

6060
// Call WriteFilesToStream and expect an error
6161
err := WriteFilesToStream(multipartWriter, []*FileInfo{file})
62-
require.NoError(t, err)
62+
assert.Error(t, err)
6363

6464
multipartReader := multipart.NewReader(body, multipartWriter.Boundary())
6565
form, err := multipartReader.ReadForm(10 * 1024)

0 commit comments

Comments
 (0)