summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJesse Hallam <jesse.hallam@gmail.com>2018-05-10 18:16:33 -0400
committerChristopher Speller <crspeller@gmail.com>2018-05-10 15:16:33 -0700
commit2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (patch)
tree3d3bf61a39534e8db4cffde9b9644c3ce895580c /api
parent7fa1c6c4bae19d1647d759198126ee4591282079 (diff)
downloadchat-2b27e12445ba51e1fa1ab2aceac5fcb3de66845d.tar.gz
chat-2b27e12445ba51e1fa1ab2aceac5fcb3de66845d.tar.bz2
chat-2b27e12445ba51e1fa1ab2aceac5fcb3de66845d.zip
MM-10188: expect io.Reader in FileBackend.WriteFile (#8765)
This is a reworked set of changes originally from @josephGuo to begin reducing the duplicated memory required when uploading files.
Diffstat (limited to 'api')
-rw-r--r--api/emoji_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/emoji_test.go b/api/emoji_test.go
index 69922a54a..108c416e1 100644
--- a/api/emoji_test.go
+++ b/api/emoji_test.go
@@ -272,7 +272,7 @@ func TestDeleteEmoji(t *testing.T) {
func createTestEmoji(t *testing.T, a *app.App, emoji *model.Emoji, imageData []byte) *model.Emoji {
emoji = store.Must(a.Srv.Store.Emoji().Save(emoji)).(*model.Emoji)
- if err := a.WriteFile(imageData, "emoji/"+emoji.Id+"/image"); err != nil {
+ if _, err := a.WriteFile(bytes.NewReader(imageData), "emoji/"+emoji.Id+"/image"); err != nil {
store.Must(a.Srv.Store.Emoji().Delete(emoji.Id, time.Now().Unix()))
t.Fatalf("failed to write image: %v", err.Error())
}