Fix linting issues

This commit is contained in:
Lena Fuhrimann 2020-05-04 09:46:41 +02:00
parent dd0545eed1
commit 5e8194e760
7 changed files with 15 additions and 13 deletions

View file

@ -1,7 +1,6 @@
package s3manager_test
import (
"errors"
"fmt"
"io/ioutil"
"net/http"
@ -97,7 +96,7 @@ func TestHandleBucketView(t *testing.T) {
listObjectsV2Func: func(string, string, bool, <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo)
go func() {
objCh <- minio.ObjectInfo{Err: errors.New("The specified bucket does not exist")}
objCh <- minio.ObjectInfo{Err: errBucketDoesNotExist}
close(objCh)
}()
return objCh
@ -111,7 +110,7 @@ func TestHandleBucketView(t *testing.T) {
listObjectsV2Func: func(string, string, bool, <-chan struct{}) <-chan minio.ObjectInfo {
objCh := make(chan minio.ObjectInfo)
go func() {
objCh <- minio.ObjectInfo{Err: errors.New("mocked S3 error")}
objCh <- minio.ObjectInfo{Err: errS3}
close(objCh)
}()
return objCh

View file

@ -1,7 +1,6 @@
package s3manager_test
import (
"errors"
"io/ioutil"
"net/http"
"net/http/httptest"
@ -41,7 +40,7 @@ func TestHandleBucketsView(t *testing.T) {
{
it: "returns error if there is an S3 error",
listBucketsFunc: func() ([]minio.BucketInfo, error) {
return []minio.BucketInfo{}, errors.New("mocked S3 error")
return []minio.BucketInfo{}, errS3
},
expectedStatusCode: http.StatusInternalServerError,
expectedBodyContains: http.StatusText(http.StatusInternalServerError),

View file

@ -2,7 +2,6 @@ package s3manager_test
import (
"bytes"
"errors"
"io/ioutil"
"net/http"
"net/http/httptest"
@ -52,7 +51,7 @@ func TestHandleCreateBucket(t *testing.T) {
{
it: "returns error if there is an S3 error",
makeBucketFunc: func(string, string) error {
return errors.New("mocked S3 error")
return errS3
},
body: `{"name":"myBucket"}`,
expectedStatusCode: http.StatusInternalServerError,

View file

@ -1,7 +1,6 @@
package s3manager_test
import (
"errors"
"io/ioutil"
"net/http"
"net/http/httptest"
@ -31,7 +30,7 @@ func TestHandleDeleteBucket(t *testing.T) {
{
it: "returns error if there is an S3 error",
removeBucketFunc: func(string) error {
return errors.New("mocked S3 error")
return errS3
},
expectedStatusCode: http.StatusInternalServerError,
expectedBodyContains: http.StatusText(http.StatusInternalServerError),

View file

@ -1,7 +1,6 @@
package s3manager_test
import (
"errors"
"net/http"
"net/http/httptest"
"strings"
@ -30,7 +29,7 @@ func TestHandleDeleteObject(t *testing.T) {
{
it: "returns error if there is an S3 error",
removeObjectFunc: func(string, string) error {
return errors.New("mocked S3 error")
return errS3
},
expectedStatusCode: http.StatusInternalServerError,
expectedBodyContains: http.StatusText(http.StatusInternalServerError),

View file

@ -0,0 +1,8 @@
package s3manager_test
import "errors"
var (
errS3 = errors.New("mocked s3 error")
errBucketDoesNotExist = errors.New("The specified bucket does not exist") // nolint: stylecheck
)

View file

@ -1,7 +1,6 @@
package s3manager_test
import (
"errors"
"fmt"
"io/ioutil"
"net/http"
@ -28,7 +27,7 @@ func TestHandleGetObject(t *testing.T) {
{
it: "returns error if there is an S3 error",
getObjectFunc: func(string, string, minio.GetObjectOptions) (*minio.Object, error) {
return nil, errors.New("mocked S3 error")
return nil, errS3
},
bucketName: "testBucket",
objectName: "testObject",