From 91617b4c522eaa034d39b208edc8221ba52e0954 Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Wed, 3 Feb 2021 08:26:27 -0800 Subject: [PATCH] device: fix goroutine leak test The leak test had rare flakes. If a system goroutine started at just the wrong moment, you'd get a false positive. Instead of looping until the goroutines look good and then checking, exit completely as soon as the number of goroutines looks good. Also, check more frequently, in an attempt to complete faster. Signed-off-by: Josh Bleecher Snyder --- device/device_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/device/device_test.go b/device/device_test.go index b783771..50e3dbc 100644 --- a/device/device_test.go +++ b/device/device_test.go @@ -405,14 +405,15 @@ func goroutineLeakCheck(t *testing.T) { return } // Give goroutines time to exit, if they need it. - for i := 0; i < 1000 && startGoroutines < runtime.NumGoroutine(); i++ { - time.Sleep(10 * time.Millisecond) - } - if got := runtime.NumGoroutine(); startGoroutines < got { - _, endStacks := goroutines() - t.Logf("starting stacks:\n%s\n", startStacks) - t.Logf("ending stacks:\n%s\n", endStacks) - t.Fatalf("expected %d goroutines, got %d, leak?", startGoroutines, got) + for i := 0; i < 10000; i++ { + if runtime.NumGoroutine() <= startGoroutines { + return + } + time.Sleep(1 * time.Millisecond) } + endGoroutines, endStacks := goroutines() + t.Logf("starting stacks:\n%s\n", startStacks) + t.Logf("ending stacks:\n%s\n", endStacks) + t.Fatalf("expected %d goroutines, got %d, leak?", startGoroutines, endGoroutines) }) }