test(*): TestRollover failed randomly on Windows

klog_test.go

@@ -28,6 +28,7 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 )
@@ -317,13 +318,16 @@ func TestVmoduleOff(t *testing.T) {
 func TestSetOutputDataRace(t *testing.T) {
 	setFlags()
 	defer logging.swap(logging.newBuffers())
+	var wg sync.WaitGroup
 	for i := 1; i <= 50; i++ {
 		go func() {
 			logging.flushDaemon()
 		}()
 	}
 	for i := 1; i <= 50; i++ {
+		wg.Add(1)
 		go func() {
+			defer wg.Done()
 			SetOutput(ioutil.Discard)
 		}()
 	}
@@ -333,7 +337,9 @@ func TestSetOutputDataRace(t *testing.T) {
 		}()
 	}
 	for i := 1; i <= 50; i++ {
+		wg.Add(1)
 		go func() {
+			defer wg.Done()
 			SetOutputBySeverity("INFO", ioutil.Discard)
 		}()
 	}
@@ -342,6 +348,7 @@ func TestSetOutputDataRace(t *testing.T) {
 			logging.flushDaemon()
 		}()
 	}
+	wg.Wait()
 }
 
 // vGlobs are patterns that match/don't match this file at V=2.