Fix race in Query Log Test (prometheus#6727)

A data race can happen if we run t.Log after the test t is done -- which in this case is highly possible because of the use of subtests and the fact that we call t.Log in a goroutine. Signed-off-by: Julien Pivotto <[email protected]>
GeorgeSen · Jan 30, 2020 · 3c4c01e · 3c4c01e
1 parent 8360120
commit 3c4c01e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cmd/prometheus/query_log_test.go b/cmd/prometheus/query_log_test.go
@@ -26,6 +26,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
+	"sync"
 	"testing"
 	"time"
 
@@ -244,9 +245,15 @@ func (p *queryLogTest) run(t *testing.T) {
 	// Log stderr in case of failure.
 	stderr, err := prom.StderrPipe()
 	testutil.Ok(t, err)
+
+	// We use a WaitGroup to avoid calling t.Log after the test is done.
+	var wg sync.WaitGroup
+	wg.Add(1)
+	defer wg.Wait()
 	go func() {
 		slurp, _ := ioutil.ReadAll(stderr)
 		t.Log(string(slurp))
+		wg.Done()
 	}()
 
 	testutil.Ok(t, prom.Start())