Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2624 from influxdata/fix-integration-timings 

Update integration test to timeout in 5 seconds rather than 0.1
pull/2623/head
Chris Goller 2017-12-19 20:16:14 -06:00 committed by GitHub
parent 8f68e396f6 020c7c6901
commit d02735b1da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integrations/server_test.go
View File

@ -1424,7 +1424,7 @@ func TestServer(t *testing.T) {
if tt.fields.Config != nil { if tt.fields.Config != nil {
if err := boltdb.ConfigStore.Update(ctx, tt.fields.Config); err != nil { if err := boltdb.ConfigStore.Update(ctx, tt.fields.Config); err != nil {
t.Fatalf("failed to update global application config", err) t.Fatalf("failed to update global application config %v", err)
return return
} }
} }
@ -1495,7 +1495,7 @@ func TestServer(t *testing.T) {
serverURL := fmt.Sprintf("http://%v:%v%v", host, port, tt.args.path) serverURL := fmt.Sprintf("http://%v:%v%v", host, port, tt.args.path)
// Wait for the server to come online // Wait for the server to come online
timeout := time.Now().Add(100 * time.Millisecond) timeout := time.Now().Add(5 * time.Second)
for { for {
_, err := http.Get(serverURL + "/swagger.json") _, err := http.Get(serverURL + "/swagger.json")
if err == nil { if err == nil {