Skip to content

Commit 37772f2

Browse files
huiguangjunhuiguangjun
committed
update testcase.
1 parent 97c9cb1 commit 37772f2

File tree

5 files changed

+42
-21
lines changed

5 files changed

+42
-21
lines changed

‎oss/bucket_test.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ var (
3939

4040
// SetUpSuite runs once when the suite starts running.
4141
func (s *OssBucketSuite) SetUpSuite(c *C) {
42+
time.Sleep(timeoutInOperation)
4243
if cloudboxControlEndpoint == "" {
4344
client, err := New(endpoint, accessID, accessKey)
4445
c.Assert(err, IsNil)
@@ -81,10 +82,12 @@ func (s *OssBucketSuite) SetUpSuite(c *C) {
8182

8283
testLogger.Println("test bucket started")
8384
}
85+
time.Sleep(timeoutInOperation)
8486
}
8587

8688
// TearDownSuite runs before each test or benchmark starts running.
8789
func (s *OssBucketSuite) TearDownSuite(c *C) {
90+
time.Sleep(timeoutInOperation)
8891
for _, bucket := range []*Bucket{s.bucket, s.archiveBucket} {
8992
// Delete multipart
9093
keyMarker := KeyMarker("")
@@ -128,7 +131,7 @@ func (s *OssBucketSuite) TearDownSuite(c *C) {
128131
c.Assert(err, IsNil)
129132
}
130133
}
131-
134+
time.Sleep(timeoutInOperation)
132135
testLogger.Println("test bucket completed")
133136
}
134137

@@ -3809,6 +3812,7 @@ func (s *OssBucketSuite) TestVersioningDeleteOldVersionObject(c *C) {
38093812
err = client.SetBucketVersioning(bucketName, versioningConfig)
38103813
c.Assert(err, IsNil)
38113814
time.Sleep(timeoutInOperation)
3815+
time.Sleep(timeoutInOperation)
38123816

38133817
bucketResult, err := client.GetBucketInfo(bucketName)
38143818
c.Assert(err, IsNil)
@@ -4082,6 +4086,7 @@ func (s *OssBucketSuite) TestVersioningBatchDeleteVersionObjects(c *C) {
40824086
err = client.SetBucketVersioning(bucketName, versioningConfig)
40834087
c.Assert(err, IsNil)
40844088
time.Sleep(timeoutInOperation)
4089+
time.Sleep(timeoutInOperation)
40854090

40864091
bucketResult, err := client.GetBucketInfo(bucketName)
40874092
c.Assert(err, IsNil)

‎oss/client_test.go‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func (s *OssClientSuite) SetUpSuite(c *C) {
230230
for _, bucket := range lbr.Buckets {
231231
ForceDeleteBucket(client, bucket.Name, c)
232232
}
233-
233+
time.Sleep(timeoutInOperation)
234234
testLogger.Println("test client started")
235235
}
236236

@@ -245,7 +245,7 @@ func (s *OssClientSuite) TearDownSuite(c *C) {
245245
for _, bucket := range lbr.Buckets {
246246
s.deleteBucket(client, bucket.Name, c)
247247
}
248-
248+
time.Sleep(timeoutInOperation)
249249
testLogger.Println("test client completed")
250250
}
251251

@@ -640,6 +640,7 @@ func (s *OssClientSuite) TestSetBucketAcl(c *C) {
640640
err = client.SetBucketACL(bucketNameTest, ACLPrivate)
641641
c.Assert(err, IsNil)
642642
time.Sleep(timeoutInOperation)
643+
time.Sleep(timeoutInOperation)
643644

644645
res, err = client.GetBucketACL(bucketNameTest)
645646
c.Assert(err, IsNil)
@@ -887,6 +888,7 @@ func (s *OssClientSuite) TestSetBucketLifecycleNew(c *C) {
887888
rules = []LifecycleRule{rule1}
888889
err = client.SetBucketLifecycle(bucketNameTest, rules)
889890
c.Assert(err, IsNil)
891+
time.Sleep(timeoutInOperation)
890892

891893
res, err := client.GetBucketLifecycle(bucketNameTest)
892894
c.Assert(err, IsNil)
@@ -902,6 +904,7 @@ func (s *OssClientSuite) TestSetBucketLifecycleNew(c *C) {
902904
rules = []LifecycleRule{rule1, rule2}
903905
err = client.SetBucketLifecycle(bucketNameTest, rules)
904906
c.Assert(err, IsNil)
907+
time.Sleep(timeoutInOperation)
905908

906909
res, err = client.GetBucketLifecycle(bucketNameTest)
907910
c.Assert(err, IsNil)
@@ -922,6 +925,7 @@ func (s *OssClientSuite) TestSetBucketLifecycleNew(c *C) {
922925
rules = []LifecycleRule{rule2, rule3}
923926
err = client.SetBucketLifecycle(bucketNameTest, rules)
924927
c.Assert(err, IsNil)
928+
time.Sleep(timeoutInOperation)
925929

926930
res, err = client.GetBucketLifecycle(bucketNameTest)
927931
c.Assert(err, IsNil)
@@ -947,6 +951,7 @@ func (s *OssClientSuite) TestSetBucketLifecycleNew(c *C) {
947951
rules = []LifecycleRule{rule1, rule3}
948952
err = client.SetBucketLifecycle(bucketNameTest, rules)
949953
c.Assert(err, IsNil)
954+
time.Sleep(timeoutInOperation)
950955

951956
res, err = client.GetBucketLifecycle(bucketNameTest)
952957
c.Assert(err, IsNil)
@@ -970,6 +975,7 @@ func (s *OssClientSuite) TestSetBucketLifecycleNew(c *C) {
970975
rules = []LifecycleRule{rule1, rule2, rule3}
971976
err = client.SetBucketLifecycle(bucketNameTest, rules)
972977
c.Assert(err, IsNil)
978+
time.Sleep(timeoutInOperation)
973979

974980
res, err = client.GetBucketLifecycle(bucketNameTest)
975981
c.Assert(err, IsNil)
@@ -1080,7 +1086,7 @@ func (s *OssClientSuite) TestSetBucketLifecycleOverLap(c *C) {
10801086
//enable overlap,error
10811087
options := []Option{AllowSameActionOverLap(true)}
10821088
err = client.SetBucketLifecycle(bucketNameTest, rules, options...)
1083-
c.Assert(err, NotNil)
1089+
c.Assert(err, IsNil)
10841090
err = client.DeleteBucket(bucketNameTest)
10851091

10861092
}
@@ -2052,6 +2058,7 @@ func (s *OssClientSuite) TestSetBucketCORS(c *C) {
20522058
// Set
20532059
err = client.SetBucketCORS(bucketNameTest, []CORSRule{rule1})
20542060
c.Assert(err, IsNil)
2061+
time.Sleep(timeoutInOperation)
20552062

20562063
gbcr, err := client.GetBucketCORS(bucketNameTest)
20572064
c.Assert(err, IsNil)
@@ -2065,6 +2072,7 @@ func (s *OssClientSuite) TestSetBucketCORS(c *C) {
20652072
// Double set
20662073
err = client.SetBucketCORS(bucketNameTest, []CORSRule{rule1})
20672074
c.Assert(err, IsNil)
2075+
time.Sleep(timeoutInOperation)
20682076

20692077
gbcr, err = client.GetBucketCORS(bucketNameTest)
20702078
c.Assert(err, IsNil)
@@ -3325,7 +3333,7 @@ func (s *OssClientSuite) TestBucketQos(c *C) {
33253333
c.Assert(len(requestId) > 0, Equals, true)
33263334

33273335
// wait a moment for configuration effect
3328-
time.Sleep(time.Second)
3336+
time.Sleep(timeoutInOperation)
33293337

33303338
retQos, err := client.GetBucketQosInfo(bucketName)
33313339
c.Assert(err, IsNil)
@@ -3348,7 +3356,7 @@ func (s *OssClientSuite) TestBucketQos(c *C) {
33483356
c.Assert(err, IsNil)
33493357

33503358
// wait a moment for configuration effect
3351-
time.Sleep(time.Second)
3359+
time.Sleep(timeoutInOperation)
33523360

33533361
retQos, err = client.GetBucketQosInfo(bucketName)
33543362
c.Assert(err, IsNil)
@@ -3364,7 +3372,7 @@ func (s *OssClientSuite) TestBucketQos(c *C) {
33643372
c.Assert(err, IsNil)
33653373

33663374
// wait a moment for configuration effect
3367-
time.Sleep(time.Second)
3375+
time.Sleep(timeoutInOperation)
33683376

33693377
_, err = client.GetBucketQosInfo(bucketName)
33703378
c.Assert(err, NotNil)
@@ -5038,6 +5046,7 @@ func (s *OssClientSuite) TestBucketAccessMonitor(c *C) {
50385046

50395047
err = client.CreateBucket(bucketNameTest)
50405048
c.Assert(err, IsNil)
5049+
time.Sleep(3 * time.Second)
50415050

50425051
res, err := client.GetBucketInfo(bucketNameTest)
50435052
c.Assert(err, IsNil)
@@ -5049,13 +5058,15 @@ func (s *OssClientSuite) TestBucketAccessMonitor(c *C) {
50495058
}
50505059
err = client.PutBucketAccessMonitor(bucketNameTest, access)
50515060
c.Assert(err, IsNil)
5061+
time.Sleep(3 * time.Second)
50525062

50535063
// Put Bucket Access Monitor twice
50545064
access = PutBucketAccessMonitor{
50555065
Status: "Enabled",
50565066
}
50575067
err = client.PutBucketAccessMonitor(bucketNameTest, access)
50585068
c.Assert(err, IsNil)
5069+
time.Sleep(3 * time.Second)
50595070

50605071
// get bucket info
50615072
res, err = client.GetBucketInfo(bucketNameTest)
@@ -5137,6 +5148,7 @@ func (s *OssClientSuite) TestBucketAccessMonitor(c *C) {
51375148
var rules = []LifecycleRule{rule1, rule2, rule3, rule4, rule5}
51385149
err = client.SetBucketLifecycle(bucketNameTest, rules)
51395150
c.Assert(err, IsNil)
5151+
time.Sleep(3 * time.Second)
51405152

51415153
// Get bucket's cycle
51425154
lc, err := client.GetBucketLifecycle(bucketNameTest)
@@ -5176,6 +5188,7 @@ func (s *OssClientSuite) TestBucketAccessMonitor(c *C) {
51765188
}
51775189
err = client.PutBucketAccessMonitor(bucketNameTest, access)
51785190
c.Assert(err, IsNil)
5191+
time.Sleep(3 * time.Second)
51795192

51805193
// get bucket info
51815194
res, err = client.GetBucketInfo(bucketNameTest)

‎oss/crc_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (s *OssCrcSuite) TestCRCRepeatedCombine(c *C) {
212212
post := hash.Sum64()
213213

214214
crc := CRC64Combine(prev, post, uint64(len(str)-i))
215-
testLogger.Println("TestCRCRepeatedCombine:", prev, post, crc, i, len(str))
215+
//testLogger.Println("TestCRCRepeatedCombine:", prev, post, crc, i, len(str))
216216
c.Assert(crc == 0x7AD25FAFA1710407, Equals, true)
217217
}
218218
}
@@ -236,7 +236,7 @@ func (s *OssCrcSuite) TestCRCRandomCombine(c *C) {
236236
crc = CRC64Combine(crc, calc.Sum64(), (uint64)(part.Size))
237237
}
238238

239-
testLogger.Println("TestCRCRandomCombine:", crc, i, fileParts)
239+
//testLogger.Println("TestCRCRandomCombine:", crc, i, fileParts)
240240
c.Assert(crc == 0x2B612D24FFF64222, Equals, true)
241241
}
242242
}

‎oss/select_csv_objcet_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ func (s *OssSelectCsvSuite) TestSelectObjectIntoFile(c *C) {
197197
c.Assert(err, IsNil)
198198
c.Assert(string(str1), Equals, string(str2))
199199

200+
fd1.Close()
200201
err = os.Remove(outfile)
201202
c.Assert(err, IsNil)
202203
err = s.bucket.DeleteObject(key)

‎oss/type_test.go‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package oss
22

33
import (
44
"encoding/xml"
5-
. "gopkg.in/check.v1"
65
"net/url"
76
"sort"
7+
8+
. "gopkg.in/check.v1"
89
)
910

1011
type OssTypeSuite struct{}
@@ -954,7 +955,7 @@ func (s *OssTypeSuite) TestLifeCycleRulesWithFilter(c *C) {
954955
<Days>100</Days>
955956
</Expiration>
956957
<Transition>
957-
<Days>Days</Days>
958+
<Days>30</Days>
958959
<StorageClass>Archive</StorageClass>
959960
</Transition>
960961
</Rule>
@@ -1003,14 +1004,15 @@ func (s *OssTypeSuite) TestLifeCycleRulesWithFilter(c *C) {
10031004
</Rule>
10041005
</LifecycleConfiguration>
10051006
`)
1006-
err = xml.Unmarshal(xmlData, &res)
1007-
c.Assert(err, IsNil)
1008-
c.Assert(res.Rules[0].ID, Equals, "test2")
1009-
c.Assert(res.Rules[0].Filter.Not[0].Prefix, Equals, "logs-demo")
1010-
c.Assert(res.Rules[0].Filter.Not[1].Prefix, Equals, "abc/not1/")
1011-
c.Assert(res.Rules[0].Filter.Not[1].Tag.Key, Equals, "notkey1")
1012-
c.Assert(res.Rules[0].Filter.Not[1].Tag.Value, Equals, "notvalue1")
1013-
c.Assert(res.Rules[0].Filter.Not[2].Prefix, Equals, "abc/not2/")
1014-
c.Assert(res.Rules[0].Filter.Not[2].Tag.Key, Equals, "notkey2")
1015-
c.Assert(res.Rules[0].Filter.Not[2].Tag.Value, Equals, "notvalue2")
1007+
var res1 GetBucketLifecycleResult
1008+
err = xml.Unmarshal(xmlData, &res1)
1009+
c.Assert(err, IsNil)
1010+
c.Assert(res1.Rules[0].ID, Equals, "test2")
1011+
c.Assert(res1.Rules[0].Filter.Not[0].Prefix, Equals, "logs-demo")
1012+
c.Assert(res1.Rules[0].Filter.Not[1].Prefix, Equals, "abc/not1/")
1013+
c.Assert(res1.Rules[0].Filter.Not[1].Tag.Key, Equals, "notkey1")
1014+
c.Assert(res1.Rules[0].Filter.Not[1].Tag.Value, Equals, "notvalue1")
1015+
c.Assert(res1.Rules[0].Filter.Not[2].Prefix, Equals, "abc/not2/")
1016+
c.Assert(res1.Rules[0].Filter.Not[2].Tag.Key, Equals, "notkey2")
1017+
c.Assert(res1.Rules[0].Filter.Not[2].Tag.Value, Equals, "notvalue2")
10161018
}

0 commit comments

Comments
 (0)