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

fix flaky TestDoOutgoingWebhookRequest/with_a_slow_response (#11712)

Browse Source 
Avoid relying on `time.Sleep` to assert timeout behaviour.
This commit is contained in:
Jesse Hallam
2019-07-31 14:25:17 -03:00
committed by GitHub
parent ee007962f4
commit 53cae67ede
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/webhook_test.go
View File

@@ -724,15 +724,16 @@ func TestDoOutgoingWebhookRequest(t *testing.T) {
})
t.Run("with a slow response", func(t *testing.T) {
timeout := 100 * time.Millisecond
releaseHandler := make(chan interface{})
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
time.Sleep(timeout + time.Millisecond)
io.Copy(w, strings.NewReader(`{"text": "Hello, World!"}`))
// Don't actually handle the response, allowing the app to timeout.
<-releaseHandler
}))
defer server.Close()
defer close(releaseHandler)
th.App.HTTPService.(*httpservice.HTTPServiceImpl).RequestTimeout = timeout
th.App.HTTPService.(*httpservice.HTTPServiceImpl).RequestTimeout = 500 * time.Millisecond
defer func() {
th.App.HTTPService.(*httpservice.HTTPServiceImpl).RequestTimeout = httpservice.RequestTimeout
}()