IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Call server.Shutdown() as go routine (#33288)

Browse Source 
server.Shutdown() blocks trying to write to s.shutdownFinished in some cases when using a test Grafana instance for a series of integration tests. 

See https://github.com/grafana/grafana/blob/master/pkg/server/server.go#L222-L224
This commit is contained in:
David Parrott 2021-04-22 13:23:08 -07:00 committed by GitHub
parent 463520c03c
commit aa5bdff97d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/tests/testinfra/testinfra.go
View File

@ -58,7 +58,7 @@ func StartGrafana(t *testing.T, grafDir, cfgPath string, sqlStore *sqlstore.SQLS
}
}()
t.Cleanup(func() {
server.Shutdown("test cleanup")
go server.Shutdown("test cleanup")
})
// Wait for Grafana to be ready