|
@@ -43,12 +43,12 @@ var (
|
|
|
|
|
|
|
|
const (
|
|
const (
|
|
|
// prefix of bucket name for bucket ops test
|
|
// prefix of bucket name for bucket ops test
|
|
|
- bucketNamePrefix = "go-sdk-test-bucket-xyz-"
|
|
|
|
|
|
|
+ bucketNamePrefix = "go-sdk-test-bucket-abcx-"
|
|
|
// bucket name for object ops test
|
|
// bucket name for object ops test
|
|
|
- bucketName = "go-sdk-test-bucket-xyz-for-object"
|
|
|
|
|
- archiveBucketName = "go-sdk-test-bucket-xyz-for-archive"
|
|
|
|
|
|
|
+ bucketName = "go-sdk-test-bucket-abcx-for-object"
|
|
|
|
|
+ archiveBucketName = "go-sdk-test-bucket-abcx-for-archive"
|
|
|
// object name for object ops test
|
|
// object name for object ops test
|
|
|
- objectNamePrefix = "go-sdk-test-object-xyz-"
|
|
|
|
|
|
|
+ objectNamePrefix = "go-sdk-test-object-abcx-"
|
|
|
// sts region is one and only hangzhou
|
|
// sts region is one and only hangzhou
|
|
|
stsRegion = "cn-hangzhou"
|
|
stsRegion = "cn-hangzhou"
|
|
|
)
|
|
)
|
|
@@ -159,14 +159,13 @@ func (s *OssClientSuite) TestCreateBucket(c *C) {
|
|
|
client.DeleteBucket(bucketNameTest)
|
|
client.DeleteBucket(bucketNameTest)
|
|
|
err = client.CreateBucket(bucketNameTest)
|
|
err = client.CreateBucket(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
|
|
+ //sleep 5 seconds after create bucket
|
|
|
|
|
+ time.Sleep(5 * time.Second)
|
|
|
|
|
|
|
|
- // Check
|
|
|
|
|
- lbr, err := client.ListBuckets()
|
|
|
|
|
|
|
+ // verify bucket is exist
|
|
|
|
|
+ found, err := client.IsBucketExist(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
-
|
|
|
|
|
- found := s.checkBucket(lbr.Buckets, bucketNameTest)
|
|
|
|
|
c.Assert(found, Equals, true)
|
|
c.Assert(found, Equals, true)
|
|
|
- time.Sleep(5 * time.Second)
|
|
|
|
|
|
|
|
|
|
res, err := client.GetBucketACL(bucketNameTest)
|
|
res, err := client.GetBucketACL(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
@@ -174,8 +173,9 @@ func (s *OssClientSuite) TestCreateBucket(c *C) {
|
|
|
|
|
|
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
|
|
+ time.Sleep(5 * time.Second)
|
|
|
|
|
|
|
|
- // Create with ACLPublicRead
|
|
|
|
|
|
|
+ // CreateBucket creates with ACLPublicRead
|
|
|
err = client.CreateBucket(bucketNameTest, ACL(ACLPublicRead))
|
|
err = client.CreateBucket(bucketNameTest, ACL(ACLPublicRead))
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
time.Sleep(5 * time.Second)
|
|
time.Sleep(5 * time.Second)
|
|
@@ -239,12 +239,10 @@ func (s *OssClientSuite) TestCreateBucket(c *C) {
|
|
|
err = client.CreateBucket(bucketNameTest, StorageClass(storage))
|
|
err = client.CreateBucket(bucketNameTest, StorageClass(storage))
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
|
|
|
|
|
- res, err := client.ListBuckets()
|
|
|
|
|
|
|
+ res, err := client.GetBucketInfo(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
- exist, b := s.getBucket(res.Buckets, bucketNameTest)
|
|
|
|
|
- c.Assert(exist, Equals, true)
|
|
|
|
|
- c.Assert(b.Name, Equals, bucketNameTest)
|
|
|
|
|
- c.Assert(b.StorageClass, Equals, string(storage))
|
|
|
|
|
|
|
+ c.Assert(res.BucketInfo.Name, Equals, bucketNameTest)
|
|
|
|
|
+ c.Assert(res.BucketInfo.StorageClass, Equals, string(storage))
|
|
|
|
|
|
|
|
// Delete
|
|
// Delete
|
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
@@ -285,30 +283,25 @@ func (s *OssClientSuite) TestDeleteBucket(c *C) {
|
|
|
// Create
|
|
// Create
|
|
|
err = client.CreateBucket(bucketNameTest)
|
|
err = client.CreateBucket(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
|
|
+ time.Sleep(5 * time.Second)
|
|
|
|
|
|
|
|
// Check
|
|
// Check
|
|
|
- lbr, err := client.ListBuckets()
|
|
|
|
|
|
|
+ found, err := client.IsBucketExist(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
-
|
|
|
|
|
- found := s.checkBucket(lbr.Buckets, bucketNameTest)
|
|
|
|
|
c.Assert(found, Equals, true)
|
|
c.Assert(found, Equals, true)
|
|
|
|
|
|
|
|
// Delete
|
|
// Delete
|
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
-
|
|
|
|
|
- time.Sleep(time.Second * 1)
|
|
|
|
|
|
|
+ time.Sleep(3 * time.Second)
|
|
|
|
|
|
|
|
// Check
|
|
// Check
|
|
|
- lbr, err = client.ListBuckets()
|
|
|
|
|
|
|
+ found, err = client.IsBucketExist(bucketNameTest)
|
|
|
c.Assert(err, IsNil)
|
|
c.Assert(err, IsNil)
|
|
|
-
|
|
|
|
|
- // Sometimes failed because of cache
|
|
|
|
|
- found = s.checkBucket(lbr.Buckets, bucketNameTest)
|
|
|
|
|
- // c.Assert(found, Equals, false)
|
|
|
|
|
|
|
+ c.Assert(found, Equals, false)
|
|
|
|
|
|
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
err = client.DeleteBucket(bucketNameTest)
|
|
|
- // c.Assert(err, IsNil)
|
|
|
|
|
|
|
+ c.Assert(err, NotNil)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// TestDeleteBucketNegative
|
|
// TestDeleteBucketNegative
|
hangzws