Skip to content

Commit

Permalink
update functional tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Auernhammer committed Sep 25, 2017
1 parent a7569c2 commit 4daeec4
Showing 1 changed file with 45 additions and 45 deletions.
90 changes: 45 additions & 45 deletions functional_tests.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ func testPutObjectReadAt() {
}

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "Get Object failed", err).Fatal()
}
Expand Down Expand Up @@ -559,7 +559,7 @@ func testPutObjectWithMetadata() {
}

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -814,7 +814,7 @@ func testGetObjectSeekEnd() {
}

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -919,7 +919,7 @@ func testGetObjectClosedTwice() {
}

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -1185,7 +1185,7 @@ func testFPutObjectMultipart() {
failureLog(function, args, startTime, "", "FPutObject failed", err).Fatal()
}

r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -1324,23 +1324,23 @@ func testFPutObject() {
}

// Check headers
rStandard, err := c.StatObject(bucketName, objectName+"-standard")
rStandard, err := c.StatObject(bucketName, objectName+"-standard", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
if rStandard.ContentType != "application/octet-stream" {
failureLog(function, args, startTime, "", "ContentType does not match, expected application/octet-stream, got "+rStandard.ContentType, err).Fatal()
}

rOctet, err := c.StatObject(bucketName, objectName+"-Octet")
rOctet, err := c.StatObject(bucketName, objectName+"-Octet", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
if rOctet.ContentType != "application/octet-stream" {
failureLog(function, args, startTime, "", "ContentType does not match, expected application/octet-stream, got "+rStandard.ContentType, err).Fatal()
}

rGTar, err := c.StatObject(bucketName, objectName+"-GTar")
rGTar, err := c.StatObject(bucketName, objectName+"-GTar", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
Expand Down Expand Up @@ -1461,7 +1461,7 @@ func testFPutObjectWithContext() {
failureLog(function, args, startTime, "", "Number of bytes does not match, expected "+string(totalSize)+", got "+string(n), err).Fatal()
}

_, err = c.StatObject(bucketName, objectName+"-Longtimeout")
_, err = c.StatObject(bucketName, objectName+"-Longtimeout", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
Expand Down Expand Up @@ -1575,7 +1575,7 @@ func testFPutObjectWithContextV2() {
failureLog(function, args, startTime, "", "Number of bytes does not match:wanted"+string(totalSize)+" got "+string(n), err).Fatal()
}

_, err = c.StatObject(bucketName, objectName+"-Longtimeout")
_, err = c.StatObject(bucketName, objectName+"-Longtimeout", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()

Expand Down Expand Up @@ -1746,7 +1746,7 @@ func testGetObjectReadSeekFunctional() {
}()

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -1901,7 +1901,7 @@ func testGetObjectReadAtFunctional() {
}

// read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "PutObject failed", err).Fatal()
}
Expand Down Expand Up @@ -2167,7 +2167,7 @@ func testCopyObject() {
failureLog(function, args, startTime, "", "Number of bytes does not match, expected "+string(int64(thirtyThreeKiB))+", got "+string(n), err).Fatal()
}

r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -2223,13 +2223,13 @@ func testCopyObject() {
}

// Source object
r, err = c.GetObject(bucketName, objectName)
r, err = c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}

// Destination object
readerCopy, err := c.GetObject(bucketName+"-copy", objectName+"-copy")
readerCopy, err := c.GetObject(bucketName+"-copy", objectName+"-copy", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -2836,7 +2836,7 @@ func testFunctional() {
failureLog(function, args, startTime, "", "Unexpected dangling incomplete upload found", err).Fatal()
}

newReader, err := c.GetObject(bucketName, objectName)
newReader, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
function = "GetObject(bucketName, objectName)"
args = map[string]interface{}{
"bucketName": bucketName,
Expand All @@ -2856,7 +2856,7 @@ func testFunctional() {
failureLog(function, args, startTime, "", "GetObject bytes mismatch", err).Fatal()
}

err = c.FGetObject(bucketName, objectName, fileName+"-f")
err = c.FGetObject(bucketName, objectName, fileName+"-f", minio.GetOptions{})
function = "FGetObject(bucketName, objectName, fileName)"
args = map[string]interface{}{
"bucketName": bucketName,
Expand Down Expand Up @@ -2987,7 +2987,7 @@ func testFunctional() {
failureLog(function, args, startTime, "", "PresignedPutObject failed", err).Fatal()
}

newReader, err = c.GetObject(bucketName, objectName+"-presigned")
newReader, err = c.GetObject(bucketName, objectName+"-presigned", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject after PresignedPutObject failed", err).Fatal()
}
Expand Down Expand Up @@ -3106,7 +3106,7 @@ func testGetObjectObjectModified() {

defer c.RemoveObject(bucketName, objectName)

reader, err := c.GetObject(bucketName, objectName)
reader, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "Failed to GetObject "+objectName+", from bucket "+bucketName, err).Fatal()
}
Expand Down Expand Up @@ -3221,7 +3221,7 @@ func testPutObjectUploadSeekedObject() {

length = int(n)

obj, err := c.GetObject(bucketName, objectName)
obj, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -3371,7 +3371,7 @@ func testGetObjectClosedTwiceV2() {
}

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -3589,23 +3589,23 @@ func testFPutObjectV2() {
}

// Check headers
rStandard, err := c.StatObject(bucketName, objectName+"-standard")
rStandard, err := c.StatObject(bucketName, objectName+"-standard", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
if rStandard.ContentType != "application/octet-stream" {
failureLog(function, args, startTime, "", "Content-Type headers mismatched, expected: application/octet-stream , got "+rStandard.ContentType, err).Fatal()
}

rOctet, err := c.StatObject(bucketName, objectName+"-Octet")
rOctet, err := c.StatObject(bucketName, objectName+"-Octet", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
if rOctet.ContentType != "application/octet-stream" {
failureLog(function, args, startTime, "", "Content-Type headers mismatched, expected: application/octet-stream , got "+rOctet.ContentType, err).Fatal()
}

rGTar, err := c.StatObject(bucketName, objectName+"-GTar")
rGTar, err := c.StatObject(bucketName, objectName+"-GTar", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
Expand Down Expand Up @@ -3768,7 +3768,7 @@ func testGetObjectReadSeekFunctionalV2() {
}

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -3913,7 +3913,7 @@ func testGetObjectReadAtFunctionalV2() {
}

// Read the data back
r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -4061,7 +4061,7 @@ func testCopyObjectV2() {
failureLog(function, args, startTime, "", "Number of bytes does not match, expected "+string(int64(thirtyThreeKiB))+" got "+string(n), err).Fatal()
}

r, err := c.GetObject(bucketName, objectName)
r, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -4117,12 +4117,12 @@ func testCopyObjectV2() {
}

// Source object
r, err = c.GetObject(bucketName, objectName)
r, err = c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
// Destination object
readerCopy, err := c.GetObject(bucketName+"-copy", objectName+"-copy")
readerCopy, err := c.GetObject(bucketName+"-copy", objectName+"-copy", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -4304,7 +4304,7 @@ func testComposeMultipleSources(c *minio.Client) {
failureLog(function, args, startTime, "", "ComposeObject failed", err).Fatal()
}

objProps, err := c.StatObject(bucketName, "dstObject")
objProps, err := c.StatObject(bucketName, "dstObject", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "StatObject failed", err).Fatal()
}
Expand Down Expand Up @@ -4378,12 +4378,12 @@ func testEncryptedCopyObjectWrapper(c *minio.Client) {
}

// 3. get copied object and check if content is equal
reqH := minio.NewGetReqHeaders()
opts := minio.GetOptions{}
for k, v := range key2.GetSSEHeaders() {
reqH.Set(k, v)
opts.Set(k, v)
}
coreClient := minio.Core{c}
reader, _, err := coreClient.GetObject(bucketName, "dstObject", reqH)
reader, _, err := coreClient.GetObject(bucketName, "dstObject", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -4481,7 +4481,7 @@ func testUserMetadataCopyingWrapper(c *minio.Client) {
}

fetchMeta := func(object string) (h http.Header) {
objInfo, err := c.StatObject(bucketName, object)
objInfo, err := c.StatObject(bucketName, object, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "Stat failed", err).Fatal()
}
Expand Down Expand Up @@ -5049,7 +5049,7 @@ func testFunctionalV2() {
failureLog(function, args, startTime, "", "Unexpected dangling incomplete upload found", err).Fatal()
}

newReader, err := c.GetObject(bucketName, objectName)
newReader, err := c.GetObject(bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand All @@ -5063,7 +5063,7 @@ func testFunctionalV2() {
failureLog(function, args, startTime, "", "Bytes mismatch", err).Fatal()
}

err = c.FGetObject(bucketName, objectName, fileName+"-f")
err = c.FGetObject(bucketName, objectName, fileName+"-f", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "FgetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -5159,7 +5159,7 @@ func testFunctionalV2() {
failureLog(function, args, startTime, "", "HTTP request to PresignedPutObject URL failed", err).Fatal()
}

newReader, err = c.GetObject(bucketName, objectName+"-presigned")
newReader, err = c.GetObject(bucketName, objectName+"-presigned", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObject failed", err).Fatal()
}
Expand Down Expand Up @@ -5265,7 +5265,7 @@ func testGetObjectWithContext() {
defer cancel()

// Read the data back
r, err := c.GetObjectWithContext(ctx, bucketName, objectName)
r, err := c.GetObjectWithContext(ctx, bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObjectWithContext failed - request timeout not honored", err).Fatal()

Expand All @@ -5274,7 +5274,7 @@ func testGetObjectWithContext() {
defer cancel()

// Read the data back
r, err = c.GetObjectWithContext(ctx, bucketName, objectName)
r, err = c.GetObjectWithContext(ctx, bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObjectWithContext failed", err).Fatal()

Expand Down Expand Up @@ -5358,15 +5358,15 @@ func testFGetObjectWithContext() {

fileName := "tempfile-context"
// Read the data back
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-f")
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-f", minio.GetOptions{})
if err == nil {
failureLog(function, args, startTime, "", "FGetObjectWithContext with short timeout failed", err).Fatal()
}
ctx, cancel = context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()

// Read the data back
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-fcontext")
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-fcontext", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "FGetObjectWithContext with long timeout failed", err).Fatal()
}
Expand Down Expand Up @@ -5510,7 +5510,7 @@ func testGetObjectWithContextV2() {
defer cancel()

// Read the data back
r, err := c.GetObjectWithContext(ctx, bucketName, objectName)
r, err := c.GetObjectWithContext(ctx, bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObjectWithContext failed due to non-cancellation upon short timeout", err).Fatal()

Expand All @@ -5519,7 +5519,7 @@ func testGetObjectWithContextV2() {
defer cancel()

// Read the data back
r, err = c.GetObjectWithContext(ctx, bucketName, objectName)
r, err = c.GetObjectWithContext(ctx, bucketName, objectName, minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "GetObjectWithContext failed due to non-cancellation upon long timeout", err).Fatal()

Expand Down Expand Up @@ -5606,7 +5606,7 @@ func testFGetObjectWithContextV2() {

fileName := "tempfile-context"
// Read the data back
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-f")
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-f", minio.GetOptions{})
if err == nil {
failureLog(function, args, startTime, "", "FGetObjectWithContext call with short request timeout failed", err).Fatal()

Expand All @@ -5615,7 +5615,7 @@ func testFGetObjectWithContextV2() {
defer cancel()

// Read the data back
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-fcontext")
err = c.FGetObjectWithContext(ctx, bucketName, objectName, fileName+"-fcontext", minio.GetOptions{})
if err != nil {
failureLog(function, args, startTime, "", "FGetObjectWithContext call with long request timeout failed", err).Fatal()
}
Expand Down

0 comments on commit 4daeec4

Please sign in to comment.