diff options
-rw-r--r-- | api4/system_test.go | 7 | ||||
-rw-r--r-- | app/emoji.go | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/api4/system_test.go b/api4/system_test.go index d4134f8e2..f46ae7436 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -618,9 +618,14 @@ func TestS3TestConnection(t *testing.T) { config.FileSettings.AmazonS3Bucket = "Wrong_bucket" _, resp = th.SystemAdminClient.TestS3Connection(&config) CheckInternalErrorStatus(t, resp) - if resp.Error.Message != "Error checking if bucket exists." { + if resp.Error.Message != "Unable to create bucket" { t.Fatal("should return error ") } + + config.FileSettings.AmazonS3Bucket = "shouldcreatenewbucket" + _, resp = th.SystemAdminClient.TestS3Connection(&config) + CheckOKStatus(t, resp) + } func TestSupportedTimezones(t *testing.T) { diff --git a/app/emoji.go b/app/emoji.go index f48501cf9..2f957fbcc 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -23,7 +23,7 @@ import ( ) const ( - MaxEmojiFileSize = 1000 * 1024 // 1 MB + MaxEmojiFileSize = 1 << 20 // 1 MB MaxEmojiWidth = 128 MaxEmojiHeight = 128 ) |