Skip to content

Commit 658971d

Browse files
chaolee50chaolee50
committed
fix test
1 parent bd4d56f commit 658971d

14 files changed

+190
-116
lines changed

Diff for: ‎client_alert_resource_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ func TestUser(t *testing.T) {
1515
type UserTestSuite struct {
1616
suite.Suite
1717
endpoint string
18-
projectName string
19-
logstoreName string
2018
accessKeyID string
2119
accessKeySecret string
2220
client Client
@@ -26,9 +24,7 @@ type UserTestSuite struct {
2624
}
2725

2826
func (s *UserTestSuite) SetupSuite() {
29-
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
30-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
31-
s.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
27+
s.endpoint = "cn-heyuan.log.aliyuncs.com"
3228
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3329
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3430
s.client.AccessKeyID = s.accessKeyID

Diff for: ‎client_alert_test.go

+37-6
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ type AlertTestSuite struct {
2626
client *Client
2727
}
2828

29-
func (s *AlertTestSuite) SetupTest() {
29+
func (s *AlertTestSuite) SetupSuite() {
3030
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
31-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
32-
s.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
31+
s.projectName = fmt.Sprintf("test-go-alert-%d", time.Now().Unix())
32+
s.logstoreName = fmt.Sprintf("logstore-%d", time.Now().Unix())
3333
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3434
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3535
slsProject, err := NewLogProject(s.projectName, s.endpoint, s.accessKeyID, s.accessKeySecret)
@@ -43,6 +43,12 @@ func (s *AlertTestSuite) SetupTest() {
4343
AccessKeySecret: s.accessKeySecret,
4444
Endpoint: s.endpoint,
4545
}
46+
s.setUp()
47+
}
48+
49+
func (s *AlertTestSuite) TearDownSuite() {
50+
err := s.client.DeleteProject(s.projectName)
51+
s.Require().Nil(err)
4652
}
4753

4854
func (s *AlertTestSuite) createAlert() error {
@@ -191,9 +197,8 @@ func (s *AlertTestSuite) createAlert2() error {
191197
},
192198
},
193199
&SeverityConfiguration{
194-
Severity: Report,
195-
EvalCondition: ConditionConfiguration{
196-
},
200+
Severity: Report,
201+
EvalCondition: ConditionConfiguration{},
197202
},
198203
},
199204
PolicyConfiguration: PolicyConfiguration{
@@ -369,3 +374,29 @@ func (s *AlertTestSuite) TestClient_ListAlert2() {
369374
err = s.client.DeleteAlert(s.projectName, s.alertName)
370375
s.Require().Nil(err)
371376
}
377+
378+
func (s *AlertTestSuite) setUp() {
379+
_, ce := s.client.CreateProject(s.projectName, "test alert")
380+
s.Require().Nil(ce)
381+
time.Sleep(time.Second * 60)
382+
cle := s.client.CreateLogStore(s.projectName, s.logstoreName, 3, 2, true, 4)
383+
s.Require().Nil(cle)
384+
cie := s.client.CreateIndex(s.projectName, s.logstoreName, Index{
385+
Keys: map[string]IndexKey{
386+
"col_0": {
387+
Token: []string{" "},
388+
DocValue: true,
389+
CaseSensitive: false,
390+
Type: "long",
391+
},
392+
"col_1": {
393+
Token: []string{",", ":", " "},
394+
DocValue: true,
395+
CaseSensitive: false,
396+
Type: "text",
397+
},
398+
},
399+
})
400+
s.Require().Nil(cie)
401+
time.Sleep(time.Second * 60)
402+
}

Diff for: ‎client_dashboard_test.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package sls
22

33
import (
4+
"fmt"
45
"os"
56
"testing"
7+
"time"
68

79
"github.com/stretchr/testify/suite"
810
)
@@ -23,8 +25,8 @@ type DashboardTestSuite struct {
2325

2426
func (s *DashboardTestSuite) SetupSuite() {
2527
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
26-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
27-
s.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
28+
s.projectName = fmt.Sprintf("test-go-dashboard-%d", time.Now().Unix())
29+
s.logstoreName = fmt.Sprintf("logstore-%d", time.Now().Unix())
2830
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
2931
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3032
s.client.AccessKeyID = s.accessKeyID
@@ -34,8 +36,8 @@ func (s *DashboardTestSuite) SetupSuite() {
3436
}
3537

3638
func (s *DashboardTestSuite) TearDownSuite() {
37-
//err := s.client.DeleteMachineGroup(s.projectName, s.machineGroupName)
38-
//s.Nil(err)
39+
err := s.client.DeleteProject(s.projectName)
40+
s.Require().Nil(err)
3941
}
4042

4143
func (s *DashboardTestSuite) TestDashboard() {

Diff for: ‎client_etl_test.go

+25-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package sls
22

33
import (
4+
"fmt"
45
"os"
56
"testing"
67
"time"
@@ -23,18 +24,27 @@ type ETLJobTestV2Suite struct {
2324
client *Client
2425
}
2526

26-
func (s *ETLJobTestV2Suite) SetupTest() {
27+
func (s *ETLJobTestV2Suite) SetupSuite() {
2728
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
28-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
29-
s.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
30-
s.targetLogstoreName = os.Getenv("LOG_TEST_TARGET_LOGSTORE")
29+
s.projectName = fmt.Sprintf("test-go-etl-%d", time.Now().Unix())
30+
s.logstoreName = fmt.Sprintf("logstore-%d", time.Now().Unix())
31+
s.targetLogstoreName = fmt.Sprintf("target-%d", time.Now().Unix())
3132
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3233
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3334
s.client = &Client{
3435
AccessKeyID: s.accessKeyID,
3536
AccessKeySecret: s.accessKeySecret,
3637
Endpoint: s.endpoint,
3738
}
39+
s.setUp()
40+
}
41+
42+
func (s *ETLJobTestV2Suite) TearDownSuite() {
43+
err := s.client.DeleteLogStore(s.projectName, s.logstoreName)
44+
s.Require().Nil(err)
45+
err = s.client.DeleteProject(s.projectName)
46+
s.Require().Nil(err)
47+
time.Sleep(time.Second * 10)
3848
}
3949

4050
func (s *ETLJobTestV2Suite) createETLJobV2(etlName string) error {
@@ -188,3 +198,14 @@ func (s *ETLJobTestV2Suite) TestClient_RestartETLJobV2() {
188198
err = s.client.DeleteETL(s.projectName, etlName)
189199
s.Require().Nil(err)
190200
}
201+
202+
func (s *ETLJobTestV2Suite) setUp() {
203+
_, ce := s.client.CreateProject(s.projectName, "test etl job")
204+
s.Require().Nil(ce)
205+
time.Sleep(time.Second * 10)
206+
cle := s.client.CreateLogStore(s.projectName, s.logstoreName, 3, 2, true, 4)
207+
s.Require().Nil(cle)
208+
cle2 := s.client.CreateLogStore(s.projectName, s.targetLogstoreName, 3, 2, true, 4)
209+
s.Require().Nil(cle2)
210+
time.Sleep(time.Second * 60)
211+
}

Diff for: ‎client_job_test.go

+8-6
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ type JobTestSuite struct {
2525

2626
func (i *JobTestSuite) SetupSuite() {
2727
i.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
28-
i.projectName = os.Getenv("LOG_TEST_PROJECT")
29-
i.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
28+
i.projectName = fmt.Sprintf("test-go-job-%d", time.Now().Unix())
29+
i.logstoreName = fmt.Sprintf("logstore-%d", time.Now().Unix())
3030
i.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3131
i.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3232
i.client.AccessKeyID = i.accessKeyID
@@ -43,8 +43,10 @@ func (i *JobTestSuite) SetupSuite() {
4343
}
4444

4545
func (i *JobTestSuite) TearDownSuite() {
46-
i.client.DeleteLogStore(i.projectName, i.logstoreName)
47-
i.client.DeleteProject(i.projectName)
46+
err := i.client.DeleteLogStore(i.projectName, i.logstoreName)
47+
i.Require().Nil(err)
48+
err = i.client.DeleteProject(i.projectName)
49+
i.Require().Nil(err)
4850
}
4951

5052
func (i *JobTestSuite) TestIngestionOSS_CRUD() {
@@ -68,7 +70,7 @@ func (i *JobTestSuite) TestIngestionOSS_CRUD() {
6870
i.Equal("5m", getIngestion.Schedule.Interval)
6971
i.Equal(true, getIngestion.Schedule.RunImmediately)
7072
i.Equal("+0800", getIngestion.Schedule.TimeZone)
71-
i.Equal("test-logstore", getIngestion.IngestionConfiguration.LogStore)
73+
i.Equal(i.logstoreName, getIngestion.IngestionConfiguration.LogStore)
7274
source := &AliyunOSSSource{}
7375
if sourceBytes, err := json.Marshal(getIngestion.IngestionConfiguration.DataSource); err != nil {
7476
i.FailNowf("marshal datasource failed", fmt.Sprintf("%v", err))
@@ -226,7 +228,7 @@ func getOssExport(logstore string) *Export {
226228
},
227229
ExportConfiguration: &ExportConfiguration{
228230
FromTime: timeUnix - 3600,
229-
ToTime: timeUnix,
231+
ToTime: timeUnix - 1800,
230232
LogStore: logstore,
231233
Parameters: map[string]string{"a": "b"},
232234
RoleArn: "test-roleArn",

Diff for: ‎client_project_policy_test.go

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package sls
22

33
import (
4+
"fmt"
45
"os"
56
"testing"
7+
"time"
68

79
"github.com/stretchr/testify/suite"
810
)
@@ -24,12 +26,14 @@ type ProjectPolicyTestSuite struct {
2426

2527
func (s *ProjectPolicyTestSuite) SetupSuite() {
2628
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
27-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
29+
s.projectName = fmt.Sprintf("test-go-project-policy-%d", time.Now().Unix())
2830
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
2931
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3032
s.client.AccessKeyID = s.accessKeyID
3133
s.client.AccessKeySecret = s.accessKeySecret
3234
s.client.Endpoint = s.endpoint
35+
_, err := s.client.CreateProject(s.projectName, "")
36+
s.Nil(err)
3337
s.policy = `
3438
{
3539
"Statement": [
@@ -59,6 +63,8 @@ func (s *ProjectPolicyTestSuite) SetupSuite() {
5963
}
6064

6165
func (s *ProjectPolicyTestSuite) TearDownSuite() {
66+
err := s.client.DeleteProject(s.projectName)
67+
s.Nil(err)
6268
}
6369

6470
func (s *ProjectPolicyTestSuite) TestClient_CURDProjectPolicy() {

Diff for: ‎client_resource_record_test.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package sls
22

33
import (
4+
"fmt"
45
"os"
56
"testing"
7+
"time"
68

79
"github.com/stretchr/testify/suite"
810
)
@@ -14,8 +16,6 @@ func TestResourceRecord(t *testing.T) {
1416
type ResourceRecordTestSuite struct {
1517
suite.Suite
1618
endpoint string
17-
projectName string
18-
logstoreName string
1919
accessKeyID string
2020
accessKeySecret string
2121
client Client
@@ -25,15 +25,13 @@ type ResourceRecordTestSuite struct {
2525
}
2626

2727
func (s *ResourceRecordTestSuite) SetupSuite() {
28-
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
29-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
30-
s.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
28+
s.endpoint = "cn-heyuan.log.aliyuncs.com"
3129
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3230
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3331
s.client.AccessKeyID = s.accessKeyID
3432
s.client.AccessKeySecret = s.accessKeySecret
3533
s.client.Endpoint = s.endpoint
36-
s.resourceName = "user.test_resource_1"
34+
s.resourceName = fmt.Sprintf("user.test_resource_%d", time.Now().Unix())
3735
s.recordId = "test_record_1"
3836
s.tagName = "test record"
3937

Diff for: ‎client_resource_test.go

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

33
import (
4+
"fmt"
5+
"github.com/stretchr/testify/suite"
46
"os"
57
"testing"
6-
7-
"github.com/stretchr/testify/suite"
8+
"time"
89
)
910

1011
func TestResource(t *testing.T) {
@@ -14,40 +15,36 @@ func TestResource(t *testing.T) {
1415
type ResourceTestSuite struct {
1516
suite.Suite
1617
endpoint string
17-
projectName string
18-
logstoreName string
1918
accessKeyID string
2019
accessKeySecret string
2120
client Client
2221
resourceName string
2322
}
2423

2524
func (s *ResourceTestSuite) SetupSuite() {
26-
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
27-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
28-
s.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
25+
s.endpoint = "cn-heyuan.log.aliyuncs.com"
2926
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3027
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3128
s.client.AccessKeyID = s.accessKeyID
3229
s.client.AccessKeySecret = s.accessKeySecret
3330
s.client.Endpoint = s.endpoint
34-
s.resourceName = "user.test_resource_1"
31+
s.resourceName = fmt.Sprintf("user.test_resource_%d", time.Now().Unix())
3532
}
3633

37-
func (s *ResourceTestSuite) TearDownSuite() {
34+
func (s *ResourceTestSuite) TearDownTest() {
3835
}
3936

4037
func (s *ResourceTestSuite) createResource() error {
4138
rs := &ResourceSchema{
4239
Schema: []*ResourceSchemaItem{
43-
&ResourceSchemaItem{
40+
{
4441
Column: "col1",
4542
Desc: "col1 desc",
4643
ExtInfo: map[string]string{},
4744
Required: true,
4845
Type: "string",
4946
},
50-
&ResourceSchemaItem{
47+
{
5148
Column: "col2",
5249
Desc: "col2 desc",
5350
ExtInfo: "optional",

Diff for: ‎client_scheduled_sql_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type ScheduledSQLTestSuite struct {
2727
client *Client
2828
}
2929

30-
func (s *ScheduledSQLTestSuite) SetupTest() {
30+
func (s *ScheduledSQLTestSuite) SetupSuite() {
3131
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
3232
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3333
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
@@ -45,7 +45,7 @@ func (s *ScheduledSQLTestSuite) SetupTest() {
4545
s.setUp()
4646
}
4747

48-
func (s *ScheduledSQLTestSuite) TearDownTest() {
48+
func (s *ScheduledSQLTestSuite) TearDownSuite() {
4949
err := s.client.DeleteProject(s.projectName)
5050
s.Require().Nil(err)
5151
}

Diff for: ‎client_store_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package sls
22

33
import (
4+
"fmt"
45
"os"
56
"strings"
67
"testing"
@@ -30,8 +31,8 @@ type LostoreTestSuite struct {
3031

3132
func (s *LostoreTestSuite) SetupSuite() {
3233
s.endpoint = os.Getenv("LOG_TEST_ENDPOINT")
33-
s.projectName = os.Getenv("LOG_TEST_PROJECT")
34-
s.logstoreName = os.Getenv("LOG_TEST_LOGSTORE")
34+
s.projectName = fmt.Sprintf("test-go-client-store-%d", time.Now().Unix())
35+
s.logstoreName = fmt.Sprintf("logstore-%d", time.Now().Unix())
3536
s.accessKeyID = os.Getenv("LOG_TEST_ACCESS_KEY_ID")
3637
s.accessKeySecret = os.Getenv("LOG_TEST_ACCESS_KEY_SECRET")
3738
s.client.AccessKeyID = s.accessKeyID

0 commit comments

Comments
 (0)