asgardius/s3manager-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove buffered channels

Browse source
This commit is contained in:
Lena Fuhrimann 2018-05-08 17:55:26 +02:00
parent b3ca2f9618
commit 69df8f252a
2 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gopkg.lock generated
View file

@ -88,7 +88,7 @@
"blake2b", "blake2b",
"ssh/terminal" "ssh/terminal"
] ]
revision = "4ec37c66abab2c7e02ae775328b2ff001c3f025a" revision = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226"
[[projects]] [[projects]]
branch = "release-branch.go1.10" branch = "release-branch.go1.10"
@ -107,7 +107,7 @@
"unix", "unix",
"windows" "windows"
] ]
revision = "7db1c3b1a98089d0071c84f646ff5c96aad43682" revision = "7dfd1290c7917b7ba22824b9d24954ab3002fe24"
[[projects]] [[projects]]
name = "golang.org/x/text" name = "golang.org/x/text"

38
internal/app/s3manager/bucket_view_test.go
View file

@ -24,9 +24,11 @@ func TestBucketViewHandler(t *testing.T) {
}{ }{
"renders a bucket containing a file": { "renders a bucket containing a file": {
listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo { listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo, 1) objCh := make(chan minio.ObjectInfo)
defer close(objCh) go func() {
objCh <- minio.ObjectInfo{Key: "testFile"} objCh <- minio.ObjectInfo{Key: "testFile"}
close(objCh)
}()
return objCh return objCh
}, },
bucketName: "testBucket", bucketName: "testBucket",
@ -36,7 +38,7 @@ func TestBucketViewHandler(t *testing.T) {
"renders placeholder for an empty bucket": { "renders placeholder for an empty bucket": {
listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo { listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo) objCh := make(chan minio.ObjectInfo)
defer close(objCh) close(objCh)
return objCh return objCh
}, },
bucketName: "testBucket", bucketName: "testBucket",
@ -45,9 +47,11 @@ func TestBucketViewHandler(t *testing.T) {
}, },
"renders a bucket containing an archive": { "renders a bucket containing an archive": {
listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo { listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo, 1) objCh := make(chan minio.ObjectInfo)
defer close(objCh) go func() {
objCh <- minio.ObjectInfo{Key: "archive.tar.gz"} objCh <- minio.ObjectInfo{Key: "archive.tar.gz"}
close(objCh)
}()
return objCh return objCh
}, },
bucketName: "testBucket", bucketName: "testBucket",
@ -56,9 +60,11 @@ func TestBucketViewHandler(t *testing.T) {
}, },
"renders a bucket containing an image": { "renders a bucket containing an image": {
listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo { listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo, 1) objCh := make(chan minio.ObjectInfo)
defer close(objCh) go func() {
objCh <- minio.ObjectInfo{Key: "testImage.png"} objCh <- minio.ObjectInfo{Key: "testImage.png"}
close(objCh)
}()
return objCh return objCh
}, },
bucketName: "testBucket", bucketName: "testBucket",
@ -67,9 +73,11 @@ func TestBucketViewHandler(t *testing.T) {
}, },
"renders a bucket containing a sound file": { "renders a bucket containing a sound file": {
listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo { listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo, 1) objCh := make(chan minio.ObjectInfo)
defer close(objCh) go func() {
objCh <- minio.ObjectInfo{Key: "testSound.mp3"} objCh <- minio.ObjectInfo{Key: "testSound.mp3"}
close(objCh)
}()
return objCh return objCh
}, },
bucketName: "testBucket", bucketName: "testBucket",
@ -78,9 +86,11 @@ func TestBucketViewHandler(t *testing.T) {
}, },
"returns error if the bucket doesn't exist": { "returns error if the bucket doesn't exist": {
listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo { listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo, 1) objCh := make(chan minio.ObjectInfo)
defer close(objCh) go func() {
objCh <- minio.ObjectInfo{Err: s3manager.ErrBucketDoesNotExist} objCh <- minio.ObjectInfo{Err: s3manager.ErrBucketDoesNotExist}
close(objCh)
}()
return objCh return objCh
}, },
bucketName: "testBucket", bucketName: "testBucket",
@ -89,9 +99,11 @@ func TestBucketViewHandler(t *testing.T) {
}, },
"returns error if there is an S3 error": { "returns error if there is an S3 error": {
listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo { listObjectsV2Func: func(bucketName string, objectPrefix string, recursive bool, doneCh <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo, 1) objCh := make(chan minio.ObjectInfo)
defer close(objCh) go func() {
objCh <- minio.ObjectInfo{Err: errors.New("mocked S3 error")} objCh <- minio.ObjectInfo{Err: errors.New("mocked S3 error")}
close(objCh)
}()
return objCh return objCh
}, },
bucketName: "testBucket", bucketName: "testBucket",