diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-03-13 17:26:56 +0100 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2018-03-14 00:26:56 +0800 |
| commit | db4402c40dca7724416f1f6a38e4e256e871c302 (patch) | |
| tree | 4f7220368cdba1f7cbe154d0938301ea9c8caee9 /api4/system_test.go | |
| parent | caf9c2409935124db85daf5b04d61b7a663ebfc8 (diff) | |
| download | chat-db4402c40dca7724416f1f6a38e4e256e871c302.tar.gz chat-db4402c40dca7724416f1f6a38e4e256e871c302.tar.bz2 chat-db4402c40dca7724416f1f6a38e4e256e871c302.zip | |
remove s3 region to be mandatory and fix when user call test s3 when the config is saved (#8454)
Diffstat (limited to 'api4/system_test.go')
| -rw-r--r-- | api4/system_test.go | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/api4/system_test.go b/api4/system_test.go index 136c11774..6ef02cbfe 100644 --- a/api4/system_test.go +++ b/api4/system_test.go @@ -497,7 +497,7 @@ func TestS3TestConnection(t *testing.T) { AmazonS3AccessKeyId: model.MINIO_ACCESS_KEY, AmazonS3SecretAccessKey: model.MINIO_SECRET_KEY, AmazonS3Bucket: "", - AmazonS3Endpoint: "", + AmazonS3Endpoint: s3Endpoint, AmazonS3SSL: model.NewBool(false), }, } @@ -512,20 +512,11 @@ func TestS3TestConnection(t *testing.T) { } config.FileSettings.AmazonS3Bucket = model.MINIO_BUCKET + config.FileSettings.AmazonS3Region = "us-east-1" _, resp = th.SystemAdminClient.TestS3Connection(&config) - CheckBadRequestStatus(t, resp) - if resp.Error.Message != "S3 Endpoint is required" { - t.Fatal("should return error - missing s3 endpoint") - } - - config.FileSettings.AmazonS3Endpoint = s3Endpoint - _, resp = th.SystemAdminClient.TestS3Connection(&config) - CheckBadRequestStatus(t, resp) - if resp.Error.Message != "S3 Region is required" { - t.Fatal("should return error - missing s3 region") - } + CheckOKStatus(t, resp) - config.FileSettings.AmazonS3Region = "us-east-1" + config.FileSettings.AmazonS3Region = "" _, resp = th.SystemAdminClient.TestS3Connection(&config) CheckOKStatus(t, resp) |