test(*): TestRollover failed randomly on Windows

lsytj0413 · sebsoto · commit edbc1d3b4aa4 · 2020-04-10T10:39:14.000-04:00
diff --git a/klog_test.go b/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.

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import (`
`28`	`28`	`"runtime"`
`29`	`29`	`"strconv"`
`30`	`30`	`"strings"`
	`31`	`+ "sync"`
`31`	`32`	`"testing"`
`32`	`33`	`"time"`
`33`	`34`	`)`
`@@ -317,13 +318,16 @@ func TestVmoduleOff(t *testing.T) {`
`317`	`318`	`func TestSetOutputDataRace(t *testing.T) {`
`318`	`319`	`setFlags()`
`319`	`320`	`defer logging.swap(logging.newBuffers())`
	`321`	`+ var wg sync.WaitGroup`
`320`	`322`	`for i := 1; i <= 50; i++ {`
`321`	`323`	`go func() {`
`322`	`324`	`logging.flushDaemon()`
`323`	`325`	`}()`
`324`	`326`	`}`
`325`	`327`	`for i := 1; i <= 50; i++ {`
	`328`	`+ wg.Add(1)`
`326`	`329`	`go func() {`
	`330`	`+ defer wg.Done()`
`327`	`331`	`SetOutput(ioutil.Discard)`
`328`	`332`	`}()`
`329`	`333`	`}`
`@@ -333,7 +337,9 @@ func TestSetOutputDataRace(t *testing.T) {`
`333`	`337`	`}()`
`334`	`338`	`}`
`335`	`339`	`for i := 1; i <= 50; i++ {`
	`340`	`+ wg.Add(1)`
`336`	`341`	`go func() {`
	`342`	`+ defer wg.Done()`
`337`	`343`	`SetOutputBySeverity("INFO", ioutil.Discard)`
`338`	`344`	`}()`
`339`	`345`	`}`
`@@ -342,6 +348,7 @@ func TestSetOutputDataRace(t *testing.T) {`
`342`	`348`	`logging.flushDaemon()`
`343`	`349`	`}()`
`344`	`350`	`}`
	`351`	`+ wg.Wait()`
`345`	`352`	`}`
`346`	`353`
`347`	`354`	`// vGlobs are patterns that match/don't match this file at V=2.`