From: Austin Clements <austin@google.com>
Date: Tue, 18 Jan 2022 21:27:40 +0000 (-0500)
Subject: runtime: deflake TestPreemptionAfterSyscall
X-Git-Tag: go1.18beta2~74
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ca33b34e17b5f4673a40c894a4f807c01d1ecebe;p=gostls13.git

runtime: deflake TestPreemptionAfterSyscall

This test occasionally takes very slightly longer than the 3 second
timeout on slow builders (especially windows-386-2008), so increase
the timeout to 5 seconds. It fails with much longer timeouts on Plan
9, so skip it as flaky there.

Updates #41015.

Change-Id: I426a7adfae92c18a0f8a223dd92762b0b91565e1
Reviewed-on: https://go-review.googlesource.com/c/go/+/379214
Trust: Austin Clements <austin@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
---

diff --git a/src/runtime/proc_test.go b/src/runtime/proc_test.go
index cc899a24c6..719d0d1aee 100644
--- a/src/runtime/proc_test.go
+++ b/src/runtime/proc_test.go
@@ -1044,7 +1044,7 @@ func testPreemptionAfterSyscall(t *testing.T, syscallDuration time.Duration) {
 		interations = 1
 	}
 	const (
-		maxDuration = 3 * time.Second
+		maxDuration = 5 * time.Second
 		nroutines   = 8
 	)
 
@@ -1080,6 +1080,10 @@ func testPreemptionAfterSyscall(t *testing.T, syscallDuration time.Duration) {
 }
 
 func TestPreemptionAfterSyscall(t *testing.T) {
+	if runtime.GOOS == "plan9" {
+		testenv.SkipFlaky(t, 41015)
+	}
+
 	for _, i := range []time.Duration{10, 100, 1000} {
 		d := i * time.Microsecond
 		t.Run(fmt.Sprint(d), func(t *testing.T) {