From d103ed6ca97ca5a2669f6cf5fe4b3d2a9c945f26 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 17 May 2017 16:51:25 -0400 Subject: Upgrading server dependancies (#6431) --- .../github.com/minio/minio-go/api_functional_v2_test.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'vendor/github.com/minio/minio-go/api_functional_v2_test.go') diff --git a/vendor/github.com/minio/minio-go/api_functional_v2_test.go b/vendor/github.com/minio/minio-go/api_functional_v2_test.go index f41cc0ff4..7e5933778 100644 --- a/vendor/github.com/minio/minio-go/api_functional_v2_test.go +++ b/vendor/github.com/minio/minio-go/api_functional_v2_test.go @@ -36,6 +36,9 @@ func TestMakeBucketErrorV2(t *testing.T) { if testing.Short() { t.Skip("skipping functional tests for short runs") } + if os.Getenv("S3_ADDRESS") != "s3.amazonaws.com" { + t.Skip("skipping region functional tests for non s3 runs") + } // Seed random based on current time. rand.Seed(time.Now().Unix()) @@ -198,14 +201,14 @@ func TestRemovePartiallyUploadedV2(t *testing.T) { go func() { i := 0 for i < 25 { - _, err = io.CopyN(writer, r, 128*1024) - if err != nil { - t.Fatal("Error:", err, bucketName) + _, cerr := io.CopyN(writer, r, 128*1024) + if cerr != nil { + t.Fatal("Error:", cerr, bucketName) } i++ r.Seek(0, 0) } - writer.CloseWithError(errors.New("Proactively closed to be verified later.")) + writer.CloseWithError(errors.New("proactively closed to be verified later")) }() objectName := bucketName + "-resumable" @@ -213,7 +216,7 @@ func TestRemovePartiallyUploadedV2(t *testing.T) { if err == nil { t.Fatal("Error: PutObject should fail.") } - if err.Error() != "Proactively closed to be verified later." { + if err.Error() != "proactively closed to be verified later" { t.Fatal("Error:", err) } err = c.RemoveIncompleteUpload(bucketName, objectName) @@ -571,6 +574,9 @@ func TestMakeBucketRegionsV2(t *testing.T) { if testing.Short() { t.Skip("skipping functional tests for short runs") } + if os.Getenv("S3_ADDRESS") != "s3.amazonaws.com" { + t.Skip("skipping region functional tests for non s3 runs") + } // Seed random based on current time. rand.Seed(time.Now().Unix()) -- cgit v1.2.3-1-g7c22