From 12d63d96420c582b5dffc2bea58e6569022d155d Mon Sep 17 00:00:00 2001 From: Kenneth Bell Date: Sat, 2 Jul 2022 17:19:36 +0100 Subject: [PATCH] runtime: improve reliability of timers test in CI --- testdata/timers.go | 36 ++++++++++++++++++------------------ testdata/timers.txt | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/testdata/timers.go b/testdata/timers.go index 99591c82..d412abc8 100644 --- a/testdata/timers.go +++ b/testdata/timers.go @@ -4,38 +4,38 @@ import "time" func main() { // Test ticker. - ticker := time.NewTicker(time.Millisecond * 160) + ticker := time.NewTicker(time.Millisecond * 250) println("waiting on ticker") go func() { - time.Sleep(time.Millisecond * 80) - println(" - after 80ms") - time.Sleep(time.Millisecond * 160) - println(" - after 240ms") - time.Sleep(time.Millisecond * 160) - println(" - after 400ms") + time.Sleep(time.Millisecond * 125) + println(" - after 125ms") + time.Sleep(time.Millisecond * 250) + println(" - after 375ms") + time.Sleep(time.Millisecond * 250) + println(" - after 625ms") }() <-ticker.C - println("waited on ticker at 160ms") + println("waited on ticker at 250ms") <-ticker.C - println("waited on ticker at 320ms") + println("waited on ticker at 500ms") ticker.Stop() - time.Sleep(time.Millisecond * 400) + time.Sleep(time.Millisecond * 500) select { case <-ticker.C: println("fail: ticker should have stopped!") default: - println("ticker was stopped (didn't send anything after 400ms)") + println("ticker was stopped (didn't send anything after 500ms)") } - timer := time.NewTimer(time.Millisecond * 160) + timer := time.NewTimer(time.Millisecond * 250) println("waiting on timer") go func() { - time.Sleep(time.Millisecond * 80) - println(" - after 80ms") - time.Sleep(time.Millisecond * 160) - println(" - after 240ms") + time.Sleep(time.Millisecond * 125) + println(" - after 125ms") + time.Sleep(time.Millisecond * 250) + println(" - after 250ms") }() <-timer.C - println("waited on timer at 160ms") - time.Sleep(time.Millisecond * 160) + println("waited on timer at 250ms") + time.Sleep(time.Millisecond * 250) } diff --git a/testdata/timers.txt b/testdata/timers.txt index 24142d54..783c402c 100644 --- a/testdata/timers.txt +++ b/testdata/timers.txt @@ -1,11 +1,11 @@ waiting on ticker - - after 80ms -waited on ticker at 160ms - - after 240ms -waited on ticker at 320ms - - after 400ms -ticker was stopped (didn't send anything after 400ms) + - after 125ms +waited on ticker at 250ms + - after 375ms +waited on ticker at 500ms + - after 625ms +ticker was stopped (didn't send anything after 500ms) waiting on timer - - after 80ms -waited on timer at 160ms - - after 240ms + - after 125ms +waited on timer at 250ms + - after 250ms