Skip to content

Commit 21196c4

Browse files
committed
Update go test.
1 parent 013f8ef commit 21196c4

File tree

1 file changed

+24
-7
lines changed

1 file changed

+24
-7
lines changed

main_test.go

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ enabled = true
2929
username = "admin"
3030
3131
[sample]
32-
storage = "{\"jobs\":[{\"key\":\"97ec882fd75855dfa1b4bd00d4a367d4\",\"name\":\"sample_1\",\"tubes\":[\"default\"],\"data\":\"aurora_test_sample_job\"},{\"key\":\"d44782912092260cec11275b73f78434\",\"name\":\"sample_2\",\"tubes\":[\"aurora_test\"],\"data\":\"aurora_test_sample_job\"},{\"key\":\"5def7a2daf5e0292bed42db9f0017c94\",\"name\":\"sample_3\",\"tubes\":[\"default\",\"aurora_test\"],\"data\":\"aurora_test_sample_job\"}],\"tubes\":[{\"name\":\"default\",\"keys\":[\"97ec882fd75855dfa1b4bd00d4a367d4\",\"5def7a2daf5e0292bed42db9f0017c94\"]},{\"name\":\"aurora_test\",\"keys\":[\"d44782912092260cec11275b73f78434\",\"5def7a2daf5e0292bed42db9f0017c94\"]}]}"`
32+
storage = "{\"jobs\":[{\"key\":\"97ec882fd75855dfa1b4bd00d4a367d4\",\"name\":\"sample_1\",\"tubes\":[\"default\"],\"data\":\"aurora_test_sample_job\",\"ttr\":60},{\"key\":\"d44782912092260cec11275b73f78434\",\"name\":\"sample_2\",\"tubes\":[\"aurora_test\"],\"data\":\"aurora_test_sample_job\",\"ttr\":60},{\"key\":\"5def7a2daf5e0292bed42db9f0017c94\",\"name\":\"sample_3\",\"tubes\":[\"default\",\"aurora_test\"],\"data\":\"aurora_test_sample_job\",\"ttr\":60}],\"tubes\":[{\"name\":\"default\",\"keys\":[\"97ec882fd75855dfa1b4bd00d4a367d4\",\"5def7a2daf5e0292bed42db9f0017c94\"]},{\"name\":\"aurora_test\",\"keys\":[\"d44782912092260cec11275b73f78434\",\"5def7a2daf5e0292bed42db9f0017c94\"]}]}"`
3333
)
3434

3535
var (
@@ -74,7 +74,7 @@ var (
7474
)
7575

7676
func testSetup() {
77-
time.Sleep(20 * time.Second) // Wait Beanstalk server ready.
77+
time.Sleep(1 * time.Second) // Wait Beanstalk server ready.
7878
selfDir, err := filepath.Abs(filepath.Dir(os.Args[0]))
7979
if err != nil {
8080
return
@@ -123,27 +123,32 @@ func TestIndex(t *testing.T) {
123123
t.Log(err)
124124
}
125125
resp, err = http.PostForm(server+"/tube?server="+bstk+"&action=addSample",
126-
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {"1"}, "addsamplename": {""}, "tubes[aurora_test]": {"1"}})
126+
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {"1"}, "addsamplename": {"test_sample_1"}, "tubes[aurora_test]": {"1"}, "addsamplettr": {"60"}})
127127
if err != nil {
128128
t.Log(err)
129129
}
130130
resp, err = http.PostForm(server+"/tube?server="+bstk+"&action=addSample",
131-
url.Values{"tube": {"default"}, "addsamplejobid": {"1"}, "addsamplename": {"sample_1"}, "tubes[aurora_test]": {"1"}})
131+
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {"1"}, "addsamplename": {""}, "tubes[aurora_test]": {"1"}, "addsamplettr": {"60"}})
132+
if err != nil {
133+
t.Log(err)
134+
}
135+
resp, err = http.PostForm(server+"/tube?server="+bstk+"&action=addSample",
136+
url.Values{"tube": {"default"}, "addsamplejobid": {"1"}, "addsamplename": {"sample_1"}, "tubes[aurora_test]": {"1"}, "addsamplettr": {"60"}})
132137
if err != nil {
133138
t.Log(err)
134139
}
135140
resp, err = http.PostForm(server+"/tube?server=not_exist_server_addr&action=addSample",
136-
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {"1"}, "addsamplename": {"sample_2"}, "tubes[default]": {"1"}})
141+
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {"1"}, "addsamplename": {"sample_2"}, "tubes[default]": {"1"}, "addsamplettr": {"60"}})
137142
if err != nil {
138143
t.Log(err)
139144
}
140145
resp, err = http.PostForm(server+"/tube?server="+bstk+"&action=addSample",
141-
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {""}, "addsamplename": {"sample_2"}, "tubes[aurora_test]": {"1"}})
146+
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {""}, "addsamplename": {"sample_2"}, "tubes[aurora_test]": {"1"}, "addsamplettr": {"60"}})
142147
if err != nil {
143148
t.Log(err)
144149
}
145150
resp, err = http.PostForm(server+"/tube?server="+bstk+"&action=addSample",
146-
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {"not_int"}, "addsamplename": {"sample_2"}, "tubes[aurora_test]": {"1"}})
151+
url.Values{"tube": {"aurora_test"}, "addsamplejobid": {"not_int"}, "addsamplename": {"sample_2"}, "tubes[aurora_test]": {"1"}, "addsamplettr": {"60"}})
147152
if err != nil {
148153
t.Log(err)
149154
}
@@ -310,6 +315,7 @@ func TestAddSample(t *testing.T) {
310315
form.Add(`action`, `actionNewSample`)
311316
form.Add(`tubes[default]`, `1`)
312317
form.Add(`addsamplejobid`, `6`)
318+
form.Add(`ttr`, `60`)
313319
req, err := http.NewRequest("POST", server+`/sample?action=actionNewSample`, strings.NewReader(form.Encode()))
314320
if err != nil {
315321
t.Log(err)
@@ -486,6 +492,17 @@ func TestStatistic(t *testing.T) {
486492
t.SkipNow()
487493
}
488494

495+
func TestReadConf(t *testing.T) {
496+
once.Do(testSetup)
497+
selfDir, err := filepath.Abs(filepath.Dir(os.Args[0]))
498+
if err != nil {
499+
return
500+
}
501+
selfConf := selfDir + string(os.PathSeparator) + `aurora.toml`
502+
os.Remove(selfConf)
503+
readConf()
504+
}
505+
489506
func TestMain(t *testing.T) {
490507
once.Do(testSetup)
491508
go func() {

0 commit comments

Comments
 (0)