Skip to content

Commit 81b7172

Browse files
shabichengshabicheng
committed
[modify] fix case fail
[modify] fix travis ci
1 parent 63e3360 commit 81b7172

File tree

7 files changed

+47
-40
lines changed

7 files changed

+47
-40
lines changed

‎.travis.yml

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@ go:
55

66
install:
77
- go get github.com/mattn/goveralls
8-
- go get github.com/gogo/protobuf/proto
9-
- go get github.com/cloudflare/golz4
10-
- go get github.com/golang/glog
11-
- go get github.com/stretchr/testify/suite
128

139
script:
1410
- $HOME/gopath/bin/goveralls -service=travis-ci

‎example/etl/etl_meta_example.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
func main() {
1212

1313
fmt.Println("etl_meta example begin")
14-
util.Client.UsingHTTP = true
14+
sls.GlobalForceUsingHTTP = true
1515
metaKey := "test-meta-key"
1616
createMeta := &sls.EtlMeta{
1717
MetaName: "xx-log",
@@ -25,7 +25,7 @@ func main() {
2525
"roleArn": "acs:ram::123456:role/aliyunlogarchiverole",
2626
},
2727
}
28-
err := util.Client.CreateEtlMeta(createMeta)
28+
err := util.Client.CreateEtlMeta(util.ProjectName, createMeta)
2929
if err != nil {
3030
fmt.Printf("CreateEtlMeta fail, err:%v\n", err)
3131
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -34,7 +34,7 @@ func main() {
3434
} else {
3535
fmt.Printf("CreateEtlMeta success\n")
3636
}
37-
etlMeta, err := util.Client.GetEtlMeta("xx-log", metaKey)
37+
etlMeta, err := util.Client.GetEtlMeta(util.ProjectName, "xx-log", metaKey)
3838
if err != nil {
3939
fmt.Printf("GetEtlMeta fail, err:%v\n", err)
4040
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -61,7 +61,7 @@ func main() {
6161
"roleArn": "acs:ram::123456:role/aliyunlogarchiverole",
6262
},
6363
}
64-
err = util.Client.UpdateEtlMeta(updateMeta)
64+
err = util.Client.UpdateEtlMeta(util.ProjectName, updateMeta)
6565
if err != nil {
6666
fmt.Printf("UpdateEtlMeta fail, err:%v\n", err)
6767
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -70,7 +70,7 @@ func main() {
7070
} else {
7171
fmt.Printf("UpdateEtlMeta success\n")
7272
}
73-
etlMeta, err = util.Client.GetEtlMeta("xx-log", metaKey)
73+
etlMeta, err = util.Client.GetEtlMeta(util.ProjectName, "xx-log", metaKey)
7474
if err != nil {
7575
fmt.Printf("GetEtlMeta fail, err:%v\n", err)
7676
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -85,7 +85,7 @@ func main() {
8585
}
8686
}
8787

88-
err = util.Client.DeleteEtlMeta("xx-log", metaKey)
88+
err = util.Client.DeleteEtlMeta(util.ProjectName, "xx-log", metaKey)
8989
if err != nil {
9090
fmt.Printf("DeletEtlMeta fail, err:%v\n", err)
9191
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -94,7 +94,7 @@ func main() {
9494
} else {
9595
fmt.Printf("DeleteEtlMeta success\n")
9696
}
97-
etlMeta, err = util.Client.GetEtlMeta("xx-log", metaKey)
97+
etlMeta, err = util.Client.GetEtlMeta(util.ProjectName, "xx-log", metaKey)
9898
if err != nil {
9999
fmt.Printf("GetEtlMeta fail, err:%v\n", err)
100100
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -109,7 +109,7 @@ func main() {
109109
}
110110
}
111111

112-
total, count, etlMetaNameList, err := util.Client.ListEtlMetaName(0, 100)
112+
total, count, etlMetaNameList, err := util.Client.ListEtlMetaName(util.ProjectName, 0, 100)
113113
if err != nil {
114114
fmt.Printf("ListEtlMetaName fail, err:%v\n", err)
115115
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -122,7 +122,7 @@ func main() {
122122
}
123123
}
124124

125-
total, count, etlMetaList, err := util.Client.ListEtlMeta("xx-log", 0, 100)
125+
total, count, etlMetaList, err := util.Client.ListEtlMeta(util.ProjectName, "xx-log", 0, 100)
126126
if err != nil {
127127
fmt.Printf("ListEtlMeta fail, err:%v\n", err)
128128
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {
@@ -136,7 +136,7 @@ func main() {
136136
}
137137
}
138138

139-
total, count, etlMetaList, err = util.Client.ListEtlMetaWithTag("xx-log", "123456", 0, 100)
139+
total, count, etlMetaList, err = util.Client.ListEtlMetaWithTag(util.ProjectName, "xx-log", "123456", 0, 100)
140140
if err != nil {
141141
fmt.Printf("ListEtlMetaWithTag fail, err:%v\n", err)
142142
if strings.Contains(err.Error(), sls.POST_BODY_INVALID) {

‎example/index/index_sample.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ func main() {
1818
time.Sleep(15 * 1000 * time.Millisecond)
1919
err := util.Client.CreateLogStore(util.ProjectName, logstore_name, 1, 2)
2020
if err != nil {
21-
fmt.Printf("CreateLogStore fail, err: ", err)
21+
fmt.Printf("CreateLogStore fail, err: %s", err)
2222
return
2323
}
2424
time.Sleep(15 * 1000 * time.Millisecond)
2525
fmt.Println("CreateLogStore success")
2626
logstore, err := util.Client.GetLogStore(util.ProjectName, logstore_name)
2727
if err != nil {
28-
fmt.Printf("GetLogStore fail, err: ", err)
28+
fmt.Printf("GetLogStore fail, err: %s", err)
2929
return
3030
}
3131
fmt.Printf("GetLogStore success, name: %s, ttl: %d, shardCount: %d, createTime: %d, lastModifyTime: %d\n", logstore.Name, logstore.TTL, logstore.ShardCount, logstore.CreateTime, logstore.LastModifyTime)
@@ -53,7 +53,7 @@ func main() {
5353
}
5454
err = util.Client.CreateIndex(util.ProjectName, logstore_name, index)
5555
if err != nil {
56-
fmt.Printf("CreateIndex fail, err: ", err)
56+
fmt.Printf("CreateIndex fail, err: %s", err)
5757
return
5858
}
5959
fmt.Println("CreateIndex success")

‎example/loghub/loghub_sample.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func main() {
3333
} else if strings.Contains(err.Error(), sls.LOGSTORE_NOT_EXIST) {
3434
err = util.Client.CreateLogStore(util.ProjectName, logstore_name, 1, 2)
3535
if err != nil {
36-
fmt.Printf("CreateLogStore fail, err: ", err.Error())
36+
fmt.Printf("CreateLogStore fail, err: %s ", err.Error())
3737
} else {
3838
fmt.Println("CreateLogStore success")
3939
}

‎log_store.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type LogStore struct {
2323
TTL int `json:"ttl"`
2424
ShardCount int `json:"shardCount"`
2525

26-
CreateTime uint32 `json:"createTime,omitempty`
26+
CreateTime uint32 `json:"createTime,omitempty"`
2727
LastModifyTime uint32 `json:"lastModifyTime,omitempty"`
2828

2929
project *LogProject

‎logstore_test.go

+30-19
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package sls
22

33
import (
4-
"os"
54
"fmt"
5+
"os"
66
"testing"
77
"time"
88

@@ -129,24 +129,34 @@ func (s *LogstoreTestSuite) TestPullLogs() {
129129
func (s *LogstoreTestSuite) TestGetLogs() {
130130
idx, err := s.Logstore.GetIndex()
131131
if err != nil {
132-
fmt.Printf("GetIndex fail, err: %v, idx: %v\n", err, idx)
133-
return
134-
}
135-
fmt.Printf("GetIndex success, idx: %v\n", idx)
136-
idxConf := Index {
137-
TTL: 7,
138-
Keys: map[string]IndexKey {
139-
},
140-
Line: &IndexLine {
141-
Token: []string{",", ":", " "},
142-
CaseSensitive: false,
143-
IncludeKeys: []string{},
144-
ExcludeKeys: []string{},
145-
},
132+
returnFlag := true
133+
if clientErr, ok := err.(*Error); ok {
134+
if clientErr.Code == "IndexConfigNotExist" {
135+
fmt.Printf("GetIndex success, no index config \n")
136+
returnFlag = false
137+
}
138+
}
139+
if returnFlag {
140+
fmt.Printf("GetIndex fail, err: %v, idx: %v\n", err, idx)
141+
return
146142
}
143+
} else {
144+
fmt.Printf("GetIndex success, idx: %v\n", idx)
145+
}
146+
idxConf := Index{
147+
TTL: 7,
148+
Keys: map[string]IndexKey{},
149+
Line: &IndexLine{
150+
Token: []string{",", ":", " "},
151+
CaseSensitive: false,
152+
IncludeKeys: []string{},
153+
ExcludeKeys: []string{},
154+
},
155+
}
147156
s.Logstore.CreateIndex(idxConf)
157+
158+
beginTime := uint32(time.Now().Unix())
148159
time.Sleep(1 * 1000 * time.Millisecond)
149-
begin_time := uint32(time.Now().Unix())
150160
c := &LogContent{
151161
Key: proto.String("error code"),
152162
Value: proto.String("InternalServerError"),
@@ -169,11 +179,12 @@ func (s *LogstoreTestSuite) TestGetLogs() {
169179
s.Nil(putErr)
170180

171181
time.Sleep(5 * 1000 * time.Millisecond)
182+
endTime := uint32(time.Now().Unix())
172183

173-
hResp, hErr := s.Logstore.GetHistograms("", int64(begin_time), int64(begin_time + 2), "InternalServerError")
184+
hResp, hErr := s.Logstore.GetHistograms("", int64(beginTime), int64(endTime), "InternalServerError")
174185
s.Nil(hErr)
175186
s.Equal(hResp.Count, int64(1))
176-
lResp, lErr := s.Logstore.GetLogs("", int64(begin_time), int64(begin_time + 2), "InternalServerError", 100, 0, false)
187+
lResp, lErr := s.Logstore.GetLogs("", int64(beginTime), int64(endTime), "InternalServerError", 100, 0, false)
177188
s.Nil(lErr)
178189
s.Equal(lResp.Count, int64(1))
179190
}
@@ -182,7 +193,7 @@ func (s *LogstoreTestSuite) TestLogstore() {
182193
logstoreName := "github-test"
183194
err := s.Project.DeleteLogStore(logstoreName)
184195
time.Sleep(5 * 1000 * time.Millisecond)
185-
err = s.Project.CreateLogStore(logstoreName, 14, 2)
196+
err = s.Project.CreateLogStore(logstoreName, 14, 2)
186197
s.Nil(err)
187198
time.Sleep(10 * 1000 * time.Millisecond)
188199
err = s.Project.UpdateLogStore(logstoreName, 7, 2)

‎project_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ func (s *ProjectTestSuite) SetupTest() {
3434
}
3535

3636
func (s *ProjectTestSuite) TestCheckProjectExist() {
37-
projectName := "not-exist-project"
37+
projectName := os.Getenv("LOG_TEST_PROJECT")
3838
exist, err := s.client.CheckProjectExist(projectName)
3939
s.Nil(err)
40-
s.False(exist)
40+
s.True(exist)
4141
}
4242

4343
// func (s *ProjectTestSuite) TestUpdateProject() {

0 commit comments

Comments
 (0)