Merge pull request #4 from aliyun/refine_test

refine test for ci

oss/bucket_test.go

@@ -28,8 +28,12 @@ type OssBucketSuite struct {
 var _ = Suite(&OssBucketSuite{})
 
 const (
-	bucketName       = "mygobucketobj"
-	objectNamePrefix = "myobject"
+	bucketName       = "go-sdk-test-obj"
+	objectNamePrefix = "my-object-"
+
+	stsServer     = "<StsServer>"
+	stsEndpoint   = "<StsEndpoint>"
+	stsBucketName = "<StsBucketName>"
 )
 
 var (
@@ -43,14 +47,13 @@ func (s *OssBucketSuite) SetUpSuite(c *C) {
 	c.Assert(err, IsNil)
 	s.client = client
 
-	err = s.client.CreateBucket(bucketName)
-	c.Assert(err, IsNil)
+	s.client.CreateBucket(bucketName)
 
 	bucket, err := s.client.Bucket(bucketName)
 	c.Assert(err, IsNil)
 	s.bucket = bucket
 
-	fmt.Println("SetUpSuite")
+	testLogger.Println("test bucket started")
 }
 
 // Run before each test or benchmark starts running
@@ -68,15 +71,13 @@ func (s *OssBucketSuite) TearDownSuite(c *C) {
 	err = s.client.DeleteBucket(bucketName)
 	c.Assert(err, IsNil)
 
-	fmt.Println("TearDownSuite")
+	testLogger.Println("test bucket completed")
 }
 
 // Run after each test or benchmark runs
 func (s *OssBucketSuite) SetUpTest(c *C) {
 	err := removeTempFiles("../oss", ".jpg")
 	c.Assert(err, IsNil)
-
-	fmt.Println("SetUpTest")
 }
 
 // Run once after all tests or benchmarks have finished running
@@ -92,8 +93,6 @@ func (s *OssBucketSuite) TearDownTest(c *C) {
 
 	err = removeTempFiles("../oss", ".txt2")
 	c.Assert(err, IsNil)
-
-	fmt.Println("TearDownTest")
 }
 
 // TestPutObject
@@ -115,7 +114,7 @@ func (s *OssBucketSuite) TestPutObject(c *C) {
 
 	acl, err := s.bucket.GetObjectACL(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("aclRes:", acl)
+	testLogger.Println("aclRes:", acl)
 	c.Assert(acl.ACL, Equals, "default")
 
 	err = s.bucket.DeleteObject(objectName)
@@ -174,12 +173,12 @@ func (s *OssBucketSuite) TestPutObject(c *C) {
 
 	acl, err = s.bucket.GetObjectACL(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectACL:", acl)
+	testLogger.Println("GetObjectACL:", acl)
 	c.Assert(acl.ACL, Equals, string(ACLPublicRead))
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 	c.Assert(meta.Get("X-Oss-Meta-Myprop"), Equals, "mypropval")
 
 	err = s.bucket.DeleteObject(objectName)
@@ -356,7 +355,7 @@ func (s *OssBucketSuite) TestPutObjectFromFile(c *C) {
 
 	acl, err := s.bucket.GetObjectACL(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("aclRes:", acl)
+	testLogger.Println("aclRes:", acl)
 	c.Assert(acl.ACL, Equals, "default")
 
 	err = s.bucket.DeleteObject(objectName)
@@ -381,12 +380,12 @@ func (s *OssBucketSuite) TestPutObjectFromFile(c *C) {
 
 	acl, err = s.bucket.GetObjectACL(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectACL:", acl)
+	testLogger.Println("GetObjectACL:", acl)
 	c.Assert(acl.ACL, Equals, string(ACLPublicRead))
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 	c.Assert(meta.Get("X-Oss-Meta-Myprop"), Equals, "mypropval")
 
 	err = s.bucket.DeleteObject(objectName)
@@ -436,7 +435,7 @@ func (s *OssBucketSuite) TestGetObject(c *C) {
 	body.Close()
 	str := string(data)
 	c.Assert(str, Equals, objectValue)
-	fmt.Println("GetObjec:", str)
+	testLogger.Println("GetObjec:", str)
 
 	// Range
 	var subObjectValue = string(([]byte(objectValue))[15:36])
@@ -446,7 +445,7 @@ func (s *OssBucketSuite) TestGetObject(c *C) {
 	body.Close()
 	str = string(data)
 	c.Assert(str, Equals, subObjectValue)
-	fmt.Println("GetObject:", str, ",", subObjectValue)
+	testLogger.Println("GetObject:", str, ",", subObjectValue)
 
 	// If-Modified-Since
 	_, err = s.bucket.GetObject(objectName, IfModifiedSince(futureDate))
@@ -495,7 +494,7 @@ func (s *OssBucketSuite) TestGetObjectToWriterNegative(c *C) {
 	c.Assert(err, IsNil)
 
 	// no exist
-	err = s.bucket.GetObjectToFile(objectName, "/tmp/x")
+	err = s.bucket.GetObjectToFile(objectName, "/root/123abc9874")
 	c.Assert(err, NotNil)
 
 	// invalid option
@@ -550,7 +549,7 @@ func (s *OssBucketSuite) TestGetObjectToFile(c *C) {
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 
 	// If-Match
 	err = s.bucket.GetObjectToFile(objectName, newFile, IfMatch(meta.Get("Etag")))
@@ -641,7 +640,7 @@ func (s *OssBucketSuite) TestListObjectsEncodingType(c *C) {
 	lor, err = s.bucket.ListObjects(Prefix(objectNamePrefix + "床前明月光"))
 	c.Assert(err, IsNil)
 	for i, obj := range lor.Objects {
-		c.Assert(obj.Key, Equals, "myobject床前明月光，疑是地上霜。举头望明月，低头思故乡。tloet"+strconv.Itoa(i))
+		c.Assert(obj.Key, Equals, "my-object-床前明月光，疑是地上霜。举头望明月，低头思故乡。tloet"+strconv.Itoa(i))
 	}
 
 	for i := 0; i < 10; i++ {
@@ -863,7 +862,7 @@ func (s *OssBucketSuite) TestSetObjectMeta(c *C) {
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("Meta:", meta)
+	testLogger.Println("Meta:", meta)
 	c.Assert(meta.Get("Expires"), Equals, futureDate.Format(http.TimeFormat))
 	c.Assert(meta.Get("X-Oss-Meta-Myprop"), Equals, "mypropval")
 
@@ -918,7 +917,7 @@ func (s *OssBucketSuite) TestGetObjectDetailedMeta(c *C) {
 	// Check
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 	c.Assert(meta.Get("Expires"), Equals, futureDate.Format(http.TimeFormat))
 	c.Assert(meta.Get("X-Oss-Meta-Myprop"), Equals, "mypropval")
 	c.Assert(meta.Get("Content-Length"), Equals, "0")
@@ -1008,7 +1007,7 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 	// check
 	lor, err := s.bucket.ListObjects(Prefix(objectName))
 	c.Assert(err, IsNil)
-	fmt.Println("objects:", lor.Objects)
+	testLogger.Println("objects:", lor.Objects)
 	c.Assert(len(lor.Objects), Equals, 2)
 
 	body, err := s.bucket.GetObject(objectName)
@@ -1023,7 +1022,7 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 	// copy with constraints x-oss-copy-source-if-modified-since
 	_, err = s.bucket.CopyObject(objectName, objectNameDest, CopySourceIfModifiedSince(futureDate))
 	c.Assert(err, NotNil)
-	fmt.Println("CopyObject:", err)
+	testLogger.Println("CopyObject:", err)
 
 	// copy with constraints x-oss-copy-source-if-unmodified-since
 	_, err = s.bucket.CopyObject(objectName, objectNameDest, CopySourceIfUnmodifiedSince(futureDate))
@@ -1032,7 +1031,7 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 	// check
 	lor, err = s.bucket.ListObjects(Prefix(objectName))
 	c.Assert(err, IsNil)
-	fmt.Println("objects:", lor.Objects)
+	testLogger.Println("objects:", lor.Objects)
 	c.Assert(len(lor.Objects), Equals, 2)
 
 	body, err = s.bucket.GetObject(objectName)
@@ -1047,7 +1046,7 @@ func (s *OssBucketSuite) TestCopyObject(c *C) {
 	// copy with constraints x-oss-copy-source-if-match
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 
 	_, err = s.bucket.CopyObject(objectName, objectNameDest, CopySourceIfMatch(meta.Get("Etag")))
 	c.Assert(err, IsNil)
@@ -1216,7 +1215,7 @@ func (s *OssBucketSuite) TestAppendObject(c *C) {
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta, ",", nextPos)
+	testLogger.Println("GetObjectDetailedMeta:", meta, ",", nextPos)
 	c.Assert(meta.Get("X-Oss-Object-Type"), Equals, "Appendable")
 	c.Assert(meta.Get("X-Oss-Meta-My"), Equals, "myprop")
 	c.Assert(meta.Get("x-oss-Meta-Mine"), Equals, "")
@@ -1224,7 +1223,7 @@ func (s *OssBucketSuite) TestAppendObject(c *C) {
 
 	acl, err := s.bucket.GetObjectACL(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectACL:", acl)
+	testLogger.Println("GetObjectACL:", acl)
 	c.Assert(acl.ACL, Equals, string(ACLPublicReadWrite))
 
 	// second append
@@ -1247,7 +1246,7 @@ func (s *OssBucketSuite) TestAppendObject(c *C) {
 
 	meta, err = s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta xxx:", meta)
+	testLogger.Println("GetObjectDetailedMeta xxx:", meta)
 	c.Assert(meta.Get("X-Oss-Object-Type"), Equals, "Appendable")
 	c.Assert(meta.Get("X-Oss-Meta-My"), Equals, "myprop")
 	c.Assert(meta.Get("x-Oss-Meta-Mine"), Equals, "")
@@ -1320,7 +1319,7 @@ func (s *OssBucketSuite) _TestSTSTonek(c *C) {
 
 	stsRes, err := getSTSToken(stsServer)
 	c.Assert(err, IsNil)
-	fmt.Println("sts:", stsRes)
+	testLogger.Println("sts:", stsRes)
 
 	client, err := New(stsEndpoint, stsRes.AccessID, stsRes.AccessKey,
 		SecurityToken(stsRes.SecurityToken))
@@ -1343,7 +1342,7 @@ func (s *OssBucketSuite) _TestSTSTonek(c *C) {
 	// List
 	lor, err := bucket.ListObjects()
 	c.Assert(err, IsNil)
-	fmt.Println("Objects:", lor.Objects)
+	testLogger.Println("Objects:", lor.Objects)
 
 	// Delete
 	err = bucket.DeleteObject(objectName)
@@ -1428,21 +1427,21 @@ func (s *OssBucketSuite) TestUploadBigFile(c *C) {
 	err = s.bucket.PutObjectFromFile(objectName, bigFile)
 	c.Assert(err, IsNil)
 	end := GetNowSec()
-	fmt.Println("Put big file:", bigFile, "use sec:", end-start)
+	testLogger.Println("Put big file:", bigFile, "use sec:", end-start)
 
 	// Check
 	start = GetNowSec()
 	err = s.bucket.GetObjectToFile(objectName, newFile)
 	c.Assert(err, IsNil)
 	end = GetNowSec()
-	fmt.Println("Get big file:", bigFile, "use sec:", end-start)
+	testLogger.Println("Get big file:", bigFile, "use sec:", end-start)
 
 	start = GetNowSec()
 	eq, err := compareFiles(bigFile, newFile)
 	c.Assert(err, IsNil)
 	c.Assert(eq, Equals, true)
 	end = GetNowSec()
-	fmt.Println("Compare big file:", bigFile, "use sec:", end-start)
+	testLogger.Println("Compare big file:", bigFile, "use sec:", end-start)
 
 	err = s.bucket.DeleteObject(objectName)
 	c.Assert(err, IsNil)
@@ -1583,7 +1582,6 @@ func removeTempFiles(path string, prefix string) error {
 	}
 
 	for _, file := range files {
-		fmt.Println("Remove file:", file)
 		os.Remove(file)
 	}
 

oss/client_test.go

@@ -5,7 +5,8 @@
 package oss
 
 import (
-	"fmt"
+	"log"
+	"os"
 	"testing"
 	"time"
 
@@ -17,27 +18,32 @@ func Test(t *testing.T) {
 	TestingT(t)
 }
 
-type OssClientSuite struct{}
+type OssClientSuite struct {}
 
 var _ = Suite(&OssClientSuite{})
 
 const (
 	// Update before running test
-	endpoint         = "<endpoint>"
-	accessID         = "<AccessKeyId>"
-	accessKey        = "<AccessKeySecret>"
-	bucketNamePrefix = "<my-go-bucket>"
-	stsServer        = "<STSServerHost>"
-	stsEndpoint      = "<endpoint>"
-	stsBucketName    = "<my-sts-bucket>"
+	endpoint         = "<testEndpoint>"
+	accessID         = "<testAccessID>"
+	accessKey        = "<testAccessKey>"
+	bucketNamePrefix = "go-sdk-test-"
+)
+
+var (
+	logPath = "go_sdk_test_" + time.Now().Format("20060102_150405") + ".log"
+	testLogFile, _ = os.OpenFile(logPath, os.O_RDWR|os.O_CREATE, 0664)
+	testLogger = log.New(testLogFile, "", log.Ldate|log.Ltime|log.Lshortfile)
 )
 
 // Run once when the suite starts running
 func (s *OssClientSuite) SetUpSuite(c *C) {
+	testLogger.Println("test client started")
 }
 
 // Run before each test or benchmark starts running
 func (s *OssClientSuite) TearDownSuite(c *C) {
+	testLogger.Println("test client completed")
 }
 
 // Run after each test or benchmark runs
@@ -120,16 +126,16 @@ func (s *OssClientSuite) TestCreateBucketNegative(c *C) {
 
 	err = client.CreateBucket("XXXX")
 	c.Assert(err, NotNil)
-	fmt.Println(err)
+	testLogger.Println(err)
 
 	err = client.CreateBucket("_bucket")
 	c.Assert(err, NotNil)
-	fmt.Println(err)
+	testLogger.Println(err)
 
 	// Acl invalid
 	err = client.CreateBucket(bucketNamePrefix+"tcbn", ACL("InvaldAcl"))
 	c.Assert(err, NotNil)
-	fmt.Println(err)
+	testLogger.Println(err)
 }
 
 // TestDeleteBucket
@@ -361,7 +367,7 @@ func (s *OssClientSuite) TestBucketAclNegative(c *C) {
 
 	err = client.SetBucketACL(bucketNameTest, "InvalidACL")
 	c.Assert(err, NotNil)
-	fmt.Println(err)
+	testLogger.Println(err)
 
 	err = client.DeleteBucket(bucketNameTest)
 	c.Assert(err, IsNil)
@@ -612,12 +618,12 @@ func (s *OssClientSuite) TestBucketRefererNegative(c *C) {
 	// not exist
 	_, err = client.GetBucketReferer(bucketNameTest)
 	c.Assert(err, NotNil)
-	fmt.Println(err)
+	testLogger.Println(err)
 
 	// not exist
 	err = client.SetBucketReferer(bucketNameTest, referers, true)
 	c.Assert(err, NotNil)
-	fmt.Println(err)
+	testLogger.Println(err)
 }
 
 // TestSetBucketLogging
@@ -1120,10 +1126,10 @@ func (s *OssClientSuite) TestEndpointFormat(c *C) {
 }
 
 // TestCname
-func (s *OssClientSuite) TestCname(c *C) {
+func (s *OssClientSuite) _TestCname(c *C) {
 	var bucketNameTest = "<my-bucket-cname>"
 
-	client, err := New("<endpoint>","<AccessKeyId>", "<AccessKeySecret>", UseCname(true))
+	client, err := New("<endpoint>", "<AccessKeyId>", "<AccessKeySecret>", UseCname(true))
 	c.Assert(err, IsNil)
 
 	err = client.CreateBucket(bucketNameTest)
@@ -1138,10 +1144,10 @@ func (s *OssClientSuite) TestCname(c *C) {
 }
 
 // TestCname
-func (s *OssClientSuite) TestCnameNegative(c *C) {
+func (s *OssClientSuite) _TestCnameNegative(c *C) {
 	var bucketNameTest = "<my-bucket-cname>"
 
-	client, err := New("<endpoint>","<AccessKeyId>", "<AccessKeySecret>", UseCname(true))
+	client, err := New("<endpoint>", "<AccessKeyId>", "<AccessKeySecret>", UseCname(true))
 	c.Assert(err, IsNil)
 
 	err = client.CreateBucket(bucketNameTest)
@@ -1155,10 +1161,10 @@ func (s *OssClientSuite) TestCnameNegative(c *C) {
 }
 
 // TestHttps
-func (s *OssClientSuite) TestHttps(c *C) {
+func (s *OssClientSuite) _TestHttps(c *C) {
 	var bucketNameTest = "<my-bucket-https>"
 
-	client, err := New("<endpoint>","<AccessKeyId>", "<AccessKeySecret>")
+	client, err := New("<endpoint>", "<AccessKeyId>", "<AccessKeySecret>")
 	c.Assert(err, IsNil)
 
 	err = client.CreateBucket(bucketNameTest)

oss/conn_test.go

@@ -1,7 +1,6 @@
 package oss
 
 import (
-	"fmt"
 	"net/http"
 
 	. "gopkg.in/check.v1"
@@ -94,7 +93,7 @@ func (s *OssConnSuite) TestAuth(c *C) {
 	req.Header.Set("Content-Md5", "ODBGOERFMDMzQTczRUY3NUE3NzA5QzdFNUYzMDQxNEM=")
 
 	conn.signHeader(req, um.getResource("bucket", "object", ""))
-	fmt.Println("AUTHORIZATION:", req.Header.Get(HTTPHeaderAuthorization))
+	testLogger.Println("AUTHORIZATION:", req.Header.Get(HTTPHeaderAuthorization))
 }
 
 func (s *OssConnSuite) TestConnToolFunc(c *C) {

oss/download_test.go

@@ -21,14 +21,13 @@ func (s *OssDownloadSuite) SetUpSuite(c *C) {
 	c.Assert(err, IsNil)
 	s.client = client
 
-	err = s.client.CreateBucket(bucketName)
-	c.Assert(err, IsNil)
+	s.client.CreateBucket(bucketName)
 
 	bucket, err := s.client.Bucket(bucketName)
 	c.Assert(err, IsNil)
 	s.bucket = bucket
 
-	fmt.Println("SetUpSuite")
+	testLogger.Println("test download started")
 }
 
 // Run before each test or benchmark starts running
@@ -57,23 +56,19 @@ func (s *OssDownloadSuite) TearDownSuite(c *C) {
 	err = s.client.DeleteBucket(bucketName)
 	c.Assert(err, IsNil)
 
-	fmt.Println("TearDownSuite")
+	testLogger.Println("test download completed")
 }
 
 // Run after each test or benchmark runs
 func (s *OssDownloadSuite) SetUpTest(c *C) {
 	err := removeTempFiles("../oss", ".jpg")
 	c.Assert(err, IsNil)
-
-	fmt.Println("SetUpTest")
 }
 
 // Run once after all tests or benchmarks have finished running
 func (s *OssDownloadSuite) TearDownTest(c *C) {
 	err := removeTempFiles("../oss", ".jpg")
 	c.Assert(err, IsNil)
-
-	fmt.Println("TearDownTest")
 }
 
 // TestUploadRoutineWithoutRecovery 多线程无断点恢复的下载

oss/multipart_test.go

@@ -3,7 +3,6 @@
 package oss
 
 import (
-	"fmt"
 	"math/rand"
 	"net/http"
 	"os"
@@ -25,14 +24,13 @@ func (s *OssBucketMultipartSuite) SetUpSuite(c *C) {
 	c.Assert(err, IsNil)
 	s.client = client
 
-	err = s.client.CreateBucket(bucketName)
-	c.Assert(err, IsNil)
+	s.client.CreateBucket(bucketName)
 
 	bucket, err := s.client.Bucket(bucketName)
 	c.Assert(err, IsNil)
 	s.bucket = bucket
 
-	fmt.Println("SetUpSuite")
+	testLogger.Println("test multipart started")
 }
 
 // Run before each test or benchmark starts running
@@ -61,15 +59,13 @@ func (s *OssBucketMultipartSuite) TearDownSuite(c *C) {
 	err = s.client.DeleteBucket(bucketName)
 	c.Assert(err, IsNil)
 
-	fmt.Println("TearDownSuite")
+	testLogger.Println("test multipart completed")
 }
 
 // Run after each test or benchmark runs
 func (s *OssBucketMultipartSuite) SetUpTest(c *C) {
 	err := removeTempFiles("../oss", ".jpg")
 	c.Assert(err, IsNil)
-
-	fmt.Println("SetUpTest")
 }
 
 // Run once after all tests or benchmarks have finished running
@@ -82,8 +78,6 @@ func (s *OssBucketMultipartSuite) TearDownTest(c *C) {
 
 	err = removeTempFiles("../oss", ".txt2")
 	c.Assert(err, IsNil)
-
-	fmt.Println("TearDownTest")
 }
 
 // TestMultipartUpload
@@ -93,7 +87,7 @@ func (s *OssBucketMultipartSuite) TestMultipartUpload(c *C) {
 
 	chunks, err := SplitFileByPartNum(fileName, 3)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	options := []Option{
 		Expires(futureDate), Meta("my", "myprop"),
@@ -115,11 +109,11 @@ func (s *OssBucketMultipartSuite) TestMultipartUpload(c *C) {
 
 	cmur, err := s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
-	fmt.Println("cmur:", cmur)
+	testLogger.Println("cmur:", cmur)
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 	c.Assert(meta.Get("X-Oss-Meta-My"), Equals, "myprop")
 	c.Assert(meta.Get("Expires"), Equals, futureDate.Format(http.TimeFormat))
 	c.Assert(meta.Get("X-Oss-Object-Type"), Equals, "Multipart")
@@ -138,7 +132,7 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFile(c *C) {
 
 	chunks, err := SplitFileByPartNum(fileName, 3)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	options := []Option{
 		Expires(futureDate), Meta("my", "myprop"),
@@ -154,11 +148,11 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFile(c *C) {
 
 	cmur, err := s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
-	fmt.Println("cmur:", cmur)
+	testLogger.Println("cmur:", cmur)
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 	c.Assert(meta.Get("X-Oss-Meta-My"), Equals, "myprop")
 	c.Assert(meta.Get("Expires"), Equals, futureDate.Format(http.TimeFormat))
 	c.Assert(meta.Get("X-Oss-Object-Type"), Equals, "Multipart")
@@ -178,7 +172,7 @@ func (s *OssBucketMultipartSuite) TestUploadPartCopy(c *C) {
 
 	chunks, err := SplitFileByPartNum(fileName, 3)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	err = s.bucket.PutObjectFromFile(objectSrc, fileName)
 	c.Assert(err, IsNil)
@@ -197,11 +191,11 @@ func (s *OssBucketMultipartSuite) TestUploadPartCopy(c *C) {
 
 	cmur, err := s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
-	fmt.Println("cmur:", cmur)
+	testLogger.Println("cmur:", cmur)
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectDesc)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 	c.Assert(meta.Get("X-Oss-Meta-My"), Equals, "myprop")
 	c.Assert(meta.Get("Expires"), Equals, futureDate.Format(http.TimeFormat))
 	c.Assert(meta.Get("X-Oss-Object-Type"), Equals, "Multipart")
@@ -223,7 +217,7 @@ func (s *OssBucketMultipartSuite) TestListUploadedParts(c *C) {
 
 	chunks, err := SplitFileByPartSize(fileName, 100*1024)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	err = s.bucket.PutObjectFromFile(objectSrc, fileName)
 	c.Assert(err, IsNil)
@@ -249,17 +243,17 @@ func (s *OssBucketMultipartSuite) TestListUploadedParts(c *C) {
 	// list
 	lupr, err := s.bucket.ListUploadedParts(imurUpload)
 	c.Assert(err, IsNil)
-	fmt.Println("lupr:", lupr)
+	testLogger.Println("lupr:", lupr)
 	c.Assert(len(lupr.UploadedParts), Equals, len(chunks))
 
 	lupr, err = s.bucket.ListUploadedParts(imurCopy)
 	c.Assert(err, IsNil)
-	fmt.Println("lupr:", lupr)
+	testLogger.Println("lupr:", lupr)
 	c.Assert(len(lupr.UploadedParts), Equals, len(chunks))
 
 	lmur, err := s.bucket.ListMultipartUploads()
 	c.Assert(err, IsNil)
-	fmt.Println("lmur:", lmur)
+	testLogger.Println("lmur:", lmur)
 	c.Assert(len(lmur.Uploads), Equals, 2)
 
 	// complete
@@ -290,7 +284,7 @@ func (s *OssBucketMultipartSuite) TestAbortMultipartUpload(c *C) {
 
 	chunks, err := SplitFileByPartSize(fileName, 100*1024)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	err = s.bucket.PutObjectFromFile(objectSrc, fileName)
 	c.Assert(err, IsNil)
@@ -316,17 +310,17 @@ func (s *OssBucketMultipartSuite) TestAbortMultipartUpload(c *C) {
 	// list
 	lupr, err := s.bucket.ListUploadedParts(imurUpload)
 	c.Assert(err, IsNil)
-	fmt.Println("lupr:", lupr)
+	testLogger.Println("lupr:", lupr)
 	c.Assert(len(lupr.UploadedParts), Equals, len(chunks))
 
 	lupr, err = s.bucket.ListUploadedParts(imurCopy)
 	c.Assert(err, IsNil)
-	fmt.Println("lupr:", lupr)
+	testLogger.Println("lupr:", lupr)
 	c.Assert(len(lupr.UploadedParts), Equals, len(chunks))
 
 	lmur, err := s.bucket.ListMultipartUploads()
 	c.Assert(err, IsNil)
-	fmt.Println("lmur:", lmur)
+	testLogger.Println("lmur:", lmur)
 	c.Assert(len(lmur.Uploads), Equals, 2)
 
 	// abort
@@ -337,7 +331,7 @@ func (s *OssBucketMultipartSuite) TestAbortMultipartUpload(c *C) {
 
 	lmur, err = s.bucket.ListMultipartUploads()
 	c.Assert(err, IsNil)
-	fmt.Println("lmur:", lmur)
+	testLogger.Println("lmur:", lmur)
 	c.Assert(len(lmur.Uploads), Equals, 0)
 
 	// download
@@ -355,7 +349,7 @@ func (s *OssBucketMultipartSuite) TestUploadPartCopyWithConstraints(c *C) {
 
 	chunks, err := SplitFileByPartNum(fileName, 3)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	err = s.bucket.PutObjectFromFile(objectSrc, fileName)
 	c.Assert(err, IsNil)
@@ -376,7 +370,7 @@ func (s *OssBucketMultipartSuite) TestUploadPartCopyWithConstraints(c *C) {
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectSrc)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 
 	for _, chunk := range chunks {
 		_, err = s.bucket.UploadPartCopy(imur, objectSrc, chunk.Offset, chunk.Size, (int)(chunk.Number),
@@ -393,7 +387,7 @@ func (s *OssBucketMultipartSuite) TestUploadPartCopyWithConstraints(c *C) {
 
 	cmur, err := s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
-	fmt.Println("cmur:", cmur)
+	testLogger.Println("cmur:", cmur)
 
 	err = s.bucket.GetObjectToFile(objectDesc, "newpic5.jpg")
 	c.Assert(err, IsNil)
@@ -412,7 +406,7 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFileOutofOrder(c *C) {
 	chunks, err := SplitFileByPartSize(fileName, 1024*100)
 	shuffleArray(chunks)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	imur, err := s.bucket.InitiateMultipartUpload(objectName)
 	var parts []UploadPart
@@ -429,7 +423,7 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFileOutofOrder(c *C) {
 
 	cmur, err := s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
-	fmt.Println("cmur:", cmur)
+	testLogger.Println("cmur:", cmur)
 
 	err = s.bucket.GetObjectToFile(objectName, "newpic6.jpg")
 	c.Assert(err, IsNil)
@@ -447,7 +441,7 @@ func (s *OssBucketMultipartSuite) TestUploadPartCopyOutofOrder(c *C) {
 	chunks, err := SplitFileByPartSize(fileName, 1024*100)
 	shuffleArray(chunks)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	err = s.bucket.PutObjectFromFile(objectSrc, fileName)
 	c.Assert(err, IsNil)
@@ -467,7 +461,7 @@ func (s *OssBucketMultipartSuite) TestUploadPartCopyOutofOrder(c *C) {
 
 	cmur, err := s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
-	fmt.Println("cmur:", cmur)
+	testLogger.Println("cmur:", cmur)
 
 	err = s.bucket.GetObjectToFile(objectDesc, "newpic7.jpg")
 	c.Assert(err, IsNil)
@@ -485,7 +479,7 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFileType(c *C) {
 
 	chunks, err := SplitFileByPartNum(fileName, 4)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	imur, err := s.bucket.InitiateMultipartUpload(objectName)
 	var parts []UploadPart
@@ -495,10 +489,10 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFileType(c *C) {
 		parts = append(parts, part)
 	}
 
-	fmt.Println("parts:", parts)
+	testLogger.Println("parts:", parts)
 	cmur, err := s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
-	fmt.Println("cmur:", cmur)
+	testLogger.Println("cmur:", cmur)
 
 	err = s.bucket.GetObjectToFile(objectName, "newpic8.jpg")
 	c.Assert(err, IsNil)
@@ -558,7 +552,7 @@ func (s *OssBucketMultipartSuite) TestListMultipartUploads(c *C) {
 	lmpu, err = s.bucket.ListMultipartUploads(KeyMarker(objectName+"12"), UploadIDMarker("EEE"))
 	c.Assert(err, IsNil)
 	c.Assert(len(lmpu.Uploads), Equals, 15)
-	//fmt.Println("UploadIDMarker", lmpu.Uploads)
+	//testLogger.Println("UploadIDMarker", lmpu.Uploads)
 
 	for _, imur := range imurs {
 		err = s.bucket.AbortMultipartUpload(imur)
@@ -580,18 +574,18 @@ func (s *OssBucketMultipartSuite) TestListMultipartUploadsEncodingKey(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(len(lmpu.Uploads), Equals, 3)
 
-	lmpu, err = s.bucket.ListMultipartUploads(Prefix("myobject让你任性让你狂tlmuek1"))
+	lmpu, err = s.bucket.ListMultipartUploads(Prefix("my-object-让你任性让你狂tlmuek1"))
 	c.Assert(err, IsNil)
 	c.Assert(len(lmpu.Uploads), Equals, 1)
 
-	lmpu, err = s.bucket.ListMultipartUploads(KeyMarker("myobject让你任性让你狂tlmuek1"))
+	lmpu, err = s.bucket.ListMultipartUploads(KeyMarker("my-object-让你任性让你狂tlmuek1"))
 	c.Assert(err, IsNil)
 	c.Assert(len(lmpu.Uploads), Equals, 1)
 
 	lmpu, err = s.bucket.ListMultipartUploads(EncodingType("url"))
 	c.Assert(err, IsNil)
 	for i, upload := range lmpu.Uploads {
-		c.Assert(upload.Key, Equals, "myobject让你任性让你狂tlmuek"+strconv.Itoa(i))
+		c.Assert(upload.Key, Equals, "my-object-让你任性让你狂tlmuek"+strconv.Itoa(i))
 	}
 
 	for _, imur := range imurs {
@@ -672,7 +666,7 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFileBigFile(c *C) {
 
 	chunks, err := SplitFileByPartNum(bigFile, 64)
 	c.Assert(err, IsNil)
-	fmt.Println("chunks:", chunks)
+	testLogger.Println("chunks:", chunks)
 
 	imur, err := s.bucket.InitiateMultipartUpload(objectName)
 	var parts []UploadPart
@@ -683,9 +677,9 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFileBigFile(c *C) {
 		parts = append(parts, part)
 	}
 	end := GetNowSec()
-	fmt.Println("Uplaod big file:", bigFile, "use sec:", end-start)
+	testLogger.Println("Uplaod big file:", bigFile, "use sec:", end-start)
 
-	fmt.Println("parts:", parts)
+	testLogger.Println("parts:", parts)
 	_, err = s.bucket.CompleteMultipartUpload(imur, parts)
 	c.Assert(err, IsNil)
 
@@ -693,14 +687,14 @@ func (s *OssBucketMultipartSuite) TestMultipartUploadFromFileBigFile(c *C) {
 	err = s.bucket.GetObjectToFile(objectName, newFile)
 	c.Assert(err, IsNil)
 	end = GetNowSec()
-	fmt.Println("Download big file:", bigFile, "use sec:", end-start)
+	testLogger.Println("Download big file:", bigFile, "use sec:", end-start)
 
 	start = GetNowSec()
 	eq, err := compareFiles(bigFile, newFile)
 	c.Assert(err, IsNil)
 	c.Assert(eq, Equals, true)
 	end = GetNowSec()
-	fmt.Println("Compare big file:", bigFile, "use sec:", end-start)
+	testLogger.Println("Compare big file:", bigFile, "use sec:", end-start)
 
 	err = s.bucket.DeleteObject(objectName)
 	c.Assert(err, IsNil)
@@ -791,12 +785,12 @@ func (s *OssBucketMultipartSuite) TestUploadFile(c *C) {
 
 	acl, err := s.bucket.GetObjectACL(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectAcl:", acl)
+	testLogger.Println("GetObjectAcl:", acl)
 	c.Assert(acl.ACL, Equals, "default")
 
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 	c.Assert(meta.Get("X-Oss-Meta-Myprop"), Equals, "mypropval")
 }
 
@@ -813,7 +807,7 @@ func (s *OssBucketMultipartSuite) TestUploadFileNegative(c *C) {
 	c.Assert(err, NotNil)
 
 	// 文件不存在
-	err = s.bucket.UploadFile(objectName, "/tmp/x", 1024*1024*1024)
+	err = s.bucket.UploadFile(objectName, "/root/123abc9874", 1024*1024*1024)
 	c.Assert(err, NotNil)
 
 	// Key无效
@@ -881,7 +875,7 @@ func (s *OssBucketMultipartSuite) TestDownloadFile(c *C) {
 	// option
 	meta, err := s.bucket.GetObjectDetailedMeta(objectName)
 	c.Assert(err, IsNil)
-	fmt.Println("GetObjectDetailedMeta:", meta)
+	testLogger.Println("GetObjectDetailedMeta:", meta)
 
 	// If-Match
 	err = s.bucket.DownloadFile(objectName, newFile, 482048/4, IfMatch(meta.Get("Etag")))

oss/upload_test.go

@@ -22,14 +22,13 @@ func (s *OssUploadSuite) SetUpSuite(c *C) {
 	c.Assert(err, IsNil)
 	s.client = client
 
-	err = s.client.CreateBucket(bucketName)
-	c.Assert(err, IsNil)
+	s.client.CreateBucket(bucketName)
 
 	bucket, err := s.client.Bucket(bucketName)
 	c.Assert(err, IsNil)
 	s.bucket = bucket
 
-	fmt.Println("SetUpSuite")
+	testLogger.Println("test upload started")
 }
 
 // Run before each test or benchmark starts running
@@ -58,23 +57,19 @@ func (s *OssUploadSuite) TearDownSuite(c *C) {
 	err = s.client.DeleteBucket(bucketName)
 	c.Assert(err, IsNil)
 
-	fmt.Println("TearDownSuite")
+	testLogger.Println("test upload completed")
 }
 
 // Run after each test or benchmark runs
 func (s *OssUploadSuite) SetUpTest(c *C) {
 	err := removeTempFiles("../oss", ".jpg")
 	c.Assert(err, IsNil)
-
-	fmt.Println("SetUpTest")
 }
 
 // Run once after all tests or benchmarks have finished running
 func (s *OssUploadSuite) TearDownTest(c *C) {
 	err := removeTempFiles("../oss", ".jpg")
 	c.Assert(err, IsNil)
-
-	fmt.Println("TearDownTest")
 }
 
 // TestUploadRoutineWithoutRecovery 多线程无断点恢复的上传

oss/utils_test.go

@@ -1,7 +1,6 @@
 package oss
 
 import (
-	"fmt"
 	. "gopkg.in/check.v1"
 )
 
@@ -22,7 +21,7 @@ func (s *OssUtilsSuite) TestUtilsSplitFile(c *C) {
 	parts, err := SplitFileByPartNum(localFile, 4)
 	c.Assert(err, IsNil)
 	c.Assert(len(parts), Equals, 4)
-	fmt.Println("parts 4:", parts)
+	testLogger.Println("parts 4:", parts)
 	for i, part := range parts {
 		c.Assert(part.Number, Equals, i+1)
 		c.Assert(part.Offset, Equals, int64(i*120512))
@@ -32,7 +31,7 @@ func (s *OssUtilsSuite) TestUtilsSplitFile(c *C) {
 	parts, err = SplitFileByPartNum(localFile, 5)
 	c.Assert(err, IsNil)
 	c.Assert(len(parts), Equals, 5)
-	fmt.Println("parts 5:", parts)
+	testLogger.Println("parts 5:", parts)
 	for i, part := range parts {
 		c.Assert(part.Number, Equals, i+1)
 		c.Assert(part.Offset, Equals, int64(i*96409))
@@ -54,7 +53,7 @@ func (s *OssUtilsSuite) TestUtilsSplitFile(c *C) {
 	parts, err = SplitFileByPartSize(localFile, 120512)
 	c.Assert(err, IsNil)
 	c.Assert(len(parts), Equals, 4)
-	fmt.Println("parts 4:", parts)
+	testLogger.Println("parts 4:", parts)
 	for i, part := range parts {
 		c.Assert(part.Number, Equals, i+1)
 		c.Assert(part.Offset, Equals, int64(i*120512))
@@ -64,7 +63,7 @@ func (s *OssUtilsSuite) TestUtilsSplitFile(c *C) {
 	parts, err = SplitFileByPartSize(localFile, 96409)
 	c.Assert(err, IsNil)
 	c.Assert(len(parts), Equals, 6)
-	fmt.Println("parts 6:", parts)
+	testLogger.Println("parts 6:", parts)
 	for i, part := range parts {
 		c.Assert(part.Number, Equals, i+1)
 		c.Assert(part.Offset, Equals, int64(i*96409))