summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2018-05-10 12:03:51 +0100
committerGeorge Goldberg <george@gberg.me>2018-05-10 12:03:51 +0100
commit11c60ea41afd419036edc54b5571f26ce680c93c (patch)
treefefb6b2336a886500f910008433a0806dfdef888 /api4
parentd3e14a1bf86ac6148e09f888384cb46c61f23cdc (diff)
parentdb6b8f6238853c6e7e48dc8015a0b25f97ee232a (diff)
downloadchat-11c60ea41afd419036edc54b5571f26ce680c93c.tar.gz
chat-11c60ea41afd419036edc54b5571f26ce680c93c.tar.bz2
chat-11c60ea41afd419036edc54b5571f26ce680c93c.zip
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'api4')
-rw-r--r--api4/system_test.go7
1 files changed, 6 insertions, 1 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) {