gsrlabs/sys
1
0
Fork 0
mirror of https://github.com/golang/sys.git synced 2026-02-08 19:56:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

unix: deflake TestPselect and TestSelect on linux

Browse Source 
On some platforms (namely Linux), Select and Pselect update the
passed-in timeval/timespec, which might lead to failing tests in
case of an EINTR. Fix this by always resetting the timeval/timespec
before calling Select/Pselect.

Also change accept timeouts within 2/3 margin of the expected timeout,
like already done in TestSelect. While at it, fix the failure log to use
the common "got X, expected Y" message.

Fixes golang/go#42210

Change-Id: Id0efbbecc9c0bf44c102d5d1880b1bae32980ad1
Reviewed-on: https://go-review.googlesource.com/c/sys/+/265020
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
Tobias Klauser
2020-10-26 15:44:41 +01:00
committed by Tobias Klauser
parent 418715ba6f
commit e075d93706
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
unix/syscall_linux_test.go
View File

@@ -234,9 +234,12 @@ func TestPselect(t *testing.T) {
}
dur := 2500 * time.Microsecond
ts := unix.NsecToTimespec(int64(dur))
var took time.Duration
for {
// On some platforms (e.g. Linux), the passed-in timespec is
// updated by pselect(2). Make sure to reset to the full
// duration in case of an EINTR.
ts := unix.NsecToTimespec(int64(dur))
start := time.Now()
n, err := unix.Pselect(0, nil, nil, nil, &ts, nil)
took = time.Since(start)
@@ -252,8 +255,10 @@ func TestPselect(t *testing.T) {
break
}
if took < dur {
t.Errorf("Pselect: timeout should have been at least %v, got %v", dur, took)
// On some builder the actual timeout might also be slightly less than the requested.
// Add an acceptable margin to avoid flaky tests.
if took < dur*2/3 {
t.Errorf("Pselect: got %v timeout, expected at least %v", took, dur)
}
}

5
unix/syscall_unix_test.go
View File

@@ -537,9 +537,12 @@ func TestSelect(t *testing.T) {
}
dur := 250 * time.Millisecond
tv := unix.NsecToTimeval(int64(dur))
var took time.Duration
for {
// On some platforms (e.g. Linux), the passed-in timeval is
// updated by select(2). Make sure to reset to the full duration
// in case of an EINTR.
tv := unix.NsecToTimeval(int64(dur))
start := time.Now()
n, err := unix.Select(0, nil, nil, nil, &tv)
took = time.Since(start)