summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorDerrick Anderson <derrick@andersonwebstudio.com>2018-05-11 10:17:59 -0400
committerDerrick Anderson <derrick@andersonwebstudio.com>2018-05-11 10:17:59 -0400
commite3ea27c30124791ca44bb314496e819ae11b01b7 (patch)
tree5063ee059ff1e5a6d443ad3063ac41dcaed3cfba /api4
parent2b27e12445ba51e1fa1ab2aceac5fcb3de66845d (diff)
parent21d3b247d9645efa9471877cc36b46de92dc1d09 (diff)
downloadchat-e3ea27c30124791ca44bb314496e819ae11b01b7.tar.gz
chat-e3ea27c30124791ca44bb314496e819ae11b01b7.tar.bz2
chat-e3ea27c30124791ca44bb314496e819ae11b01b7.zip
Merge release-4.10 with master
Diffstat (limited to 'api4')
-rw-r--r--api4/system_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/system_test.go b/api4/system_test.go
index f46ae7436..8e15f6ed2 100644
--- a/api4/system_test.go
+++ b/api4/system_test.go
@@ -570,7 +570,7 @@ func TestGetAnalyticsOld(t *testing.T) {
CheckUnauthorizedStatus(t, resp)
}
-func TestS3TestConnection(t *testing.T) {
+/*func TestS3TestConnection(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer th.TearDown()
Client := th.Client
@@ -626,7 +626,7 @@ func TestS3TestConnection(t *testing.T) {
_, resp = th.SystemAdminClient.TestS3Connection(&config)
CheckOKStatus(t, resp)
-}
+}*/
func TestSupportedTimezones(t *testing.T) {
th := Setup().InitBasic()