MM-43232: Racy test TestWebsocketRace (#19969)

We wait until the loop has exited to finish the test

https://mattermost.atlassian.net/browse/MM-43232

```release-note
NONE
```
Этот коммит содержится в:
Agniva De Sarker
2022-04-14 13:25:19 +05:30
коммит произвёл GitHub
родитель 6eb83812e1
Коммит c6dcf460b2

Просмотреть файл

@@ -7,6 +7,7 @@ import (
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"strings" "strings"
"sync"
"testing" "testing"
"time" "time"
@@ -16,8 +17,9 @@ import (
"github.com/vmihailenco/msgpack/v5" "github.com/vmihailenco/msgpack/v5"
) )
func dummyWebsocketHandler(t *testing.T) http.HandlerFunc { func dummyWebsocketHandler(t *testing.T, wg *sync.WaitGroup) http.HandlerFunc {
return func(w http.ResponseWriter, req *http.Request) { return func(w http.ResponseWriter, req *http.Request) {
defer wg.Done()
upgrader := &websocket.Upgrader{ upgrader := &websocket.Upgrader{
ReadBufferSize: 1024, ReadBufferSize: 1024,
WriteBufferSize: 1024, WriteBufferSize: 1024,
@@ -26,6 +28,10 @@ func dummyWebsocketHandler(t *testing.T) http.HandlerFunc {
require.NoError(t, err) require.NoError(t, err)
var buf []byte var buf []byte
for { for {
err = conn.SetReadDeadline(time.Now().Add(time.Second))
if err != nil {
break
}
_, buf, err = conn.ReadMessage() _, buf, err = conn.ReadMessage()
if err != nil { if err != nil {
break break
@@ -42,8 +48,13 @@ func dummyWebsocketHandler(t *testing.T) http.HandlerFunc {
// TestWebSocketRace needs to be run with -race to verify that // TestWebSocketRace needs to be run with -race to verify that
// there is no race. // there is no race.
func TestWebSocketRace(t *testing.T) { func TestWebSocketRace(t *testing.T) {
s := httptest.NewServer(dummyWebsocketHandler(t)) var wg sync.WaitGroup
defer s.Close() wg.Add(1)
s := httptest.NewServer(dummyWebsocketHandler(t, &wg))
defer func() {
s.Close()
wg.Wait()
}()
url := strings.Replace(s.URL, "http://", "ws://", 1) url := strings.Replace(s.URL, "http://", "ws://", 1)
cli, err := NewWebSocketClient4(url, "authToken") cli, err := NewWebSocketClient4(url, "authToken")
@@ -63,8 +74,13 @@ func TestWebSocketClose(t *testing.T) {
// Therefore, it is still racy and can panic. There is no use chasing this // Therefore, it is still racy and can panic. There is no use chasing this
// again because it will be completely overhauled in v6. // again because it will be completely overhauled in v6.
t.Skip("Skipping the test. Will be changed in v6.") t.Skip("Skipping the test. Will be changed in v6.")
s := httptest.NewServer(dummyWebsocketHandler(t)) var wg sync.WaitGroup
defer s.Close() wg.Add(1)
s := httptest.NewServer(dummyWebsocketHandler(t, &wg))
defer func() {
s.Close()
wg.Wait()
}()
url := strings.Replace(s.URL, "http://", "ws://", 1) url := strings.Replace(s.URL, "http://", "ws://", 1)