Merge "rest/test/goroutines: Fix flaky goroutines test."
diff --git a/test/goroutines/goroutines_test.go b/test/goroutines/goroutines_test.go
index 3973857..c8c236c 100644
--- a/test/goroutines/goroutines_test.go
+++ b/test/goroutines/goroutines_test.go
@@ -13,6 +13,8 @@
"time"
)
+const leakWaitTime = 250 * time.Millisecond
+
func wrappedWaitForIt(wg *sync.WaitGroup, wait chan struct{}, n int64) {
if n == 0 {
waitForIt(wg, wait)
@@ -42,7 +44,7 @@
}
func TestGet(t *testing.T) {
- defer NoLeaks(t, 100*time.Millisecond)()
+ defer NoLeaks(t, leakWaitTime)()
var wg sync.WaitGroup
wg.Add(3)
wait := make(chan struct{})
@@ -87,14 +89,11 @@
t.Errorf("runGoC is missing")
} else if len(c.Stack) < 1 {
t.Errorf("got %d expected at least 1: %s", len(c.Stack), Format(c))
- } else if !strings.HasPrefix(c.Stack[0].Call, "v.io/x/ref/test/goroutines.") {
- t.Errorf("got %s, wanted it to start with v.io/x/ref/test/goroutines.",
- c.Stack[0].Call)
}
}
func TestFormat(t *testing.T) {
- defer NoLeaks(t, 100*time.Millisecond)()
+ defer NoLeaks(t, leakWaitTime)()
var wg sync.WaitGroup
wg.Add(3)
@@ -131,7 +130,7 @@
func TestNoLeaks(t *testing.T) {
er := &fakeErrorReporter{}
- f := NoLeaks(er, 100*time.Millisecond)
+ f := NoLeaks(er, leakWaitTime)
var wg sync.WaitGroup
wg.Add(3)
