From 531fa07ad2441b5b63b311f84a20fc5d0ce8f69e Mon Sep 17 00:00:00 2001
From: Erik Grinaker <erik@interchain.berlin>
Date: Wed, 16 Sep 2020 10:48:28 +0200
Subject: [PATCH] rpc: fix test data races (#5363)

Fixes a couple of test data races. `testing.T` is not concurrency-safe and should not be used in goroutines at all.
---
 rpc/jsonrpc/server/http_server_test.go | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/rpc/jsonrpc/server/http_server_test.go b/rpc/jsonrpc/server/http_server_test.go
index ec1e288da..60f3ce126 100644
--- a/rpc/jsonrpc/server/http_server_test.go
+++ b/rpc/jsonrpc/server/http_server_test.go
@@ -4,7 +4,6 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -57,13 +56,10 @@ func TestMaxOpenConnections(t *testing.T) {
 			c := http.Client{Timeout: 3 * time.Second}
 			r, err := c.Get("http://" + l.Addr().String())
 			if err != nil {
-				t.Log(err)
 				atomic.AddInt32(&failed, 1)
 				return
 			}
 			defer r.Body.Close()
-			_, err = io.Copy(ioutil.Discard, r.Body)
-			require.NoError(t, err)
 		}()
 	}
 	wg.Wait()
@@ -85,12 +81,18 @@ func TestServeTLS(t *testing.T) {
 		fmt.Fprint(w, "some body")
 	})
 
+	chErr := make(chan error, 1)
 	go func() {
-		if err := ServeTLS(ln, mux, "test.crt", "test.key", log.TestingLogger(), DefaultConfig()); err != nil {
-			t.Log(err)
-		}
+		// FIXME This goroutine leaks
+		chErr <- ServeTLS(ln, mux, "test.crt", "test.key", log.TestingLogger(), DefaultConfig())
 	}()
 
+	select {
+	case err := <-chErr:
+		require.NoError(t, err)
+	case <-time.After(100 * time.Millisecond):
+	}
+
 	tr := &http.Transport{
 		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 	}