Fixes more merge conflicts

minio · Nov 20, 2017 · a7a9fb0 · a7a9fb0
1 parent f0e2f6c
commit a7a9fb0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/functional_tests.go b/functional_tests.go
@@ -1566,7 +1566,7 @@ func testFPutObject() {
 		return
 	}
 
-	successLogger(function, args, startTime).Info()
+	successLogger(testName, function, args, startTime).Info()
 }
 
 // Tests FPutObjectWithContext request context cancels after timeout
@@ -1677,7 +1677,7 @@ func testFPutObjectWithContext() {
 		return
 	}
 
-	successLogger(function, args, startTime).Info()
+	successLogger(testName, function, args, startTime).Info()
 
 }
 
@@ -1790,7 +1790,7 @@ func testFPutObjectWithContextV2() {
 		return
 	}
 
-	successLogger(function, args, startTime).Info()
+	successLogger(testName, function, args, startTime).Info()
 
 }
 
@@ -3128,7 +3128,8 @@ func testFunctional() {
 	bucketName := randString(60, rand.NewSource(time.Now().UnixNano()), "minio-go-test-")
 
 	// Make a new bucket.
-	function = function_all = "MakeBucket(bucketName, region)"
+	function = "MakeBucket(bucketName, region)"
+	function_all = "MakeBucket(bucketName, region)"
 	args = map[string]interface{}{
 		"bucketName": bucketName,
 	}
@@ -5535,9 +5536,9 @@ func testPutObjectNoLengthV2() {
 	bufSize := dataFileMap["datafile-65-MB"]
 	var reader = getDataReader("datafile-65-MB")
 	defer reader.Close()
+	args["size"] = bufSize
 
 	// Upload an object.
-	args["size"] = sixtyFiveMiB
 	n, err := c.PutObject(bucketName, objectName, reader, -1, minio.PutObjectOptions{})
 
 	if err != nil {
@@ -5791,7 +5792,8 @@ func testFunctionalV2() {
 	bucketName := randString(60, rand.NewSource(time.Now().UnixNano()), "minio-go-test-")
 	location := "us-east-1"
 	// Make a new bucket.
-	function = function_all = "MakeBucket(bucketName, location)"
+	function = "MakeBucket(bucketName, location)"
+	function_all = "MakeBucket(bucketName, location)"
 	args = map[string]interface{}{
 		"bucketName": bucketName,
 		"location":   location,