소스 검색

refine case

鸣镝 9 년 전
부모
커밋
a6c914bac7
4개의 변경된 파일11개의 추가작업 그리고 13개의 파일을 삭제
  1. 3 4
      oss/bucket_test.go
  2. 6 6
      oss/client_test.go
  3. 1 2
      oss/multicopy_test.go
  4. 1 1
      oss/upload_test.go

+ 3 - 4
oss/bucket_test.go

@@ -1133,8 +1133,7 @@ func (s *OssBucketSuite) TestCopyObjectToOrFrom(c *C) {
 	destBucket := bucketName + "-dest"
 	objectNameDest := objectName + "dest"
 
-	err := s.client.CreateBucket(destBucket)
-	c.Assert(err, IsNil)
+	s.client.CreateBucket(destBucket)
 
 	destBuck, err := s.client.Bucket(destBucket)
 	c.Assert(err, IsNil)
@@ -1181,8 +1180,8 @@ func (s *OssBucketSuite) TestCopyObjectToOrFrom(c *C) {
 // TestCopyObjectToOrFromNegative
 func (s *OssBucketSuite) TestCopyObjectToOrFromNegative(c *C) {
 	objectName := objectNamePrefix + "tcotofn"
-	destBucket := bucketName + "-dest"
-	objectNameDest := objectName + "dest"
+	destBucket := bucketName + "-destn"
+	objectNameDest := objectName + "destn"
 
 	// object no exist
 	_, err := s.bucket.CopyObjectTo(bucketName, objectName, objectNameDest)

+ 6 - 6
oss/client_test.go

@@ -479,7 +479,7 @@ func (s *OssClientSuite) TestGetBucketLocation(c *C) {
 	c.Assert(err, IsNil)
 
 	loc, err := client.GetBucketLocation(bucketNameTest)
-	c.Assert(loc, Equals, "oss-cn-hangzhou")
+	c.Assert(strings.HasPrefix(loc, "oss-"), Equals, true)
 
 	err = client.DeleteBucket(bucketNameTest)
 	c.Assert(err, IsNil)
@@ -683,8 +683,8 @@ func (s *OssClientSuite) TestBucketRefererNegative(c *C) {
 
 // TestSetBucketLogging
 func (s *OssClientSuite) TestSetBucketLogging(c *C) {
-	var bucketNameTest = bucketNamePrefix + "tsbl"
-	var bucketNameTarget = bucketNamePrefix + "tsblt"
+	var bucketNameTest = bucketNamePrefix + "tsbll"
+	var bucketNameTarget = bucketNamePrefix + "tsbllt"
 
 	client, err := New(endpoint, accessID, accessKey)
 	c.Assert(err, IsNil)
@@ -781,8 +781,8 @@ func (s *OssClientSuite) TestDeleteBucketLogging(c *C) {
 
 // TestSetBucketLoggingNegative
 func (s *OssClientSuite) TestSetBucketLoggingNegative(c *C) {
-	var bucketNameTest = bucketNamePrefix + "tsbln"
-	var bucketNameTarget = bucketNamePrefix + "tsblnt"
+	var bucketNameTest = bucketNamePrefix + "tsblnn"
+	var bucketNameTarget = bucketNamePrefix + "tsblnnt"
 
 	client, err := New(endpoint, accessID, accessKey)
 	c.Assert(err, IsNil)
@@ -1169,7 +1169,7 @@ func (s *OssClientSuite) TestGetBucketInfo(c *C) {
 	res, err := client.GetBucketInfo(bucketNameTest)
 	c.Assert(err, IsNil)
 	c.Assert(res.BucketInfo.Name, Equals, bucketNameTest)
-	c.Assert(strings.HasPrefix(res.BucketInfo.Location, "oss-cn-"), Equals, true)
+	c.Assert(strings.HasPrefix(res.BucketInfo.Location, "oss-"), Equals, true)
 	c.Assert(res.BucketInfo.ACL, Equals, "private")
 	c.Assert(strings.HasSuffix(res.BucketInfo.ExtranetEndpoint, ".com"), Equals, true)
 	c.Assert(strings.HasSuffix(res.BucketInfo.IntranetEndpoint, ".com"), Equals, true)

+ 1 - 2
oss/multicopy_test.go

@@ -415,7 +415,7 @@ func (s *OssCopySuite) TestCopyRoutineWithRecoveryNegative(c *C) {
 
 // TestCopyFileCrossBucket 跨Bucket直接的复制
 func (s *OssCopySuite) TestCopyFileCrossBucket(c *C) {
-	destBucketName := bucketName + "-desc"
+	destBucketName := bucketName + "-cfcb-desc"
 	srcObjectName := objectNamePrefix + "tcrtr"
 	destObjectName := srcObjectName + "-copy"
 	fileName := "../sample/BingWallpaper-2015-11-07.jpg"
@@ -426,7 +426,6 @@ func (s *OssCopySuite) TestCopyFileCrossBucket(c *C) {
 
 	// 创建目标Bucket
 	err = s.client.CreateBucket(destBucketName)
-	c.Assert(err, IsNil)
 
 	// 上传源文件
 	err = s.bucket.UploadFile(srcObjectName, fileName, 100*1024, Routines(3))

+ 1 - 1
oss/upload_test.go

@@ -250,7 +250,7 @@ func (s *OssUploadSuite) TestUploadRoutineWithRecovery(c *C) {
 	c.Assert(len(ucp.MD5), Equals, len("LC34jZU5xK4hlxi3Qn3XGQ=="))
 	c.Assert(ucp.FilePath, Equals, fileName)
 	c.Assert(ucp.FileStat.Size, Equals, int64(482048))
-	c.Assert(ucp.FileStat.LastModified.String(), Equals, "2015-12-17 18:43:03 +0800 CST")
+	c.Assert(len(ucp.FileStat.LastModified.String()), Equals, len("2015-12-17 18:43:03 +0800 CST"))
 	c.Assert(ucp.FileStat.MD5, Equals, "")
 	c.Assert(ucp.ObjectKey, Equals, objectName)
 	c.Assert(len(ucp.UploadID), Equals, len("3F79722737D1469980DACEDCA325BB52"))