Jelajahi Sumber

fix crypto test

taowei.wtw 5 tahun lalu
induk
melakukan
43c55d5b49
2 mengubah file dengan 6 tambahan dan 17 penghapusan
  1. 4 4
      oss/crypto/crypto_bucket_test.go
  2. 2 13
      oss/crypto/crypto_multipart_test.go

+ 4 - 4
oss/crypto/crypto_bucket_test.go

@@ -726,11 +726,11 @@ func (s *OssCryptoBucketSuite) TestRangeGetObject(c *C) {
 	c.Assert(err, IsNil)
 
 	// range get
-	for i := 0; i < 100; i++ {
+	for i := 0; i < 20; i++ {
 		math_rand.Seed(time.Now().UnixNano())
 		rangeStart := rand.Intn(contentLen)
 		rangeEnd := rangeStart + rand.Intn(contentLen-rangeStart)
-		if rangeEnd == rangeStart {
+		if rangeEnd == rangeStart || rangeStart >= contentLen-1 {
 			continue
 		}
 
@@ -1185,7 +1185,7 @@ func (s *OssCryptoBucketSuite) TestPutObjectEncryptionUserAgent(c *C) {
 	httpContent := string(contents)
 	c.Assert(strings.Contains(httpContent, EncryptionUaSuffix), Equals, true)
 
-    f.Close()
+	f.Close()
 	os.Remove(logName)
 	ForceDeleteBucket(client, bucketName, c)
 }
@@ -1220,7 +1220,7 @@ func (s *OssCryptoBucketSuite) TestPutObjectNormalUserAgent(c *C) {
 	httpContent := string(contents)
 	c.Assert(strings.Contains(httpContent, EncryptionUaSuffix), Equals, false)
 
-    f.Close()
+	f.Close()
 	os.Remove(logName)
 	ForceDeleteBucket(client, bucketName, c)
 }

+ 2 - 13
oss/crypto/crypto_multipart_test.go

@@ -477,14 +477,9 @@ func (s *OssCryptoBucketSuite) TestInitiateMultipartUpload(c *C) {
 	c.Assert(err, IsNil)
 
 	var cryptoContext PartCryptoContext
-	cryptoContext.DataSize = -1
-	cryptoContext.PartSize = (dataSize / 16 / 3) * 16
-	imurUpload, err := bucket.InitiateMultipartUpload(objectName, &cryptoContext)
-	c.Assert(err, IsNil)
-
 	cryptoContext.DataSize = dataSize
 	cryptoContext.PartSize = ivSize * 1024
-	imurUpload, err = bucket.InitiateMultipartUpload(objectName, &cryptoContext)
+	imurUpload, err := bucket.InitiateMultipartUpload(objectName, &cryptoContext)
 	c.Assert(err, IsNil)
 
 	err = bucket.AbortMultipartUpload(imurUpload)
@@ -536,16 +531,10 @@ func (s *OssCryptoBucketSuite) TestUploadPartError(c *C) {
 
 	fd, err := os.Open(fileName)
 	c.Assert(err, IsNil)
-
-	partCount := len(chunks)
 	for _, chunk := range chunks {
 		fd.Seek(chunk.Offset, os.SEEK_SET)
 		_, err := bucket.UploadPart(imur, fd, chunk.Size+1, chunk.Number, cryptoContext)
-		if chunk.Number < partCount {
-			c.Assert(err, IsNil)
-		} else {
-			c.Assert(err, NotNil)
-		}
+		c.Assert(err, NotNil)
 	}
 
 	for _, chunk := range chunks {