fix #13166 tioselectors flaky test on freebsd+OSX (#14634)

(cherry picked from commit d149823019)
This commit is contained in:
Timothee Cour
2020-06-12 21:19:23 -07:00
committed by narimiran
parent 74f34c81e8
commit 6dde797752
2 changed files with 56 additions and 9 deletions

View File

@@ -10,9 +10,7 @@ template processTest(t, x: untyped) =
#stdout.flushFile()
if not x: echo(t & " FAILED\r\n")
when defined(macosx):
echo "All tests passed!"
elif not defined(windows):
when not defined(windows):
import os, posix, nativesockets
when ioselSupportedPlatform:
@@ -147,15 +145,16 @@ elif not defined(windows):
proc timer_notification_test(): bool =
var selector = newSelector[int]()
var timer = selector.registerTimer(100, false, 0)
var rc1 = selector.select(140)
var rc2 = selector.select(140)
assert(len(rc1) == 1 and len(rc2) == 1)
var rc1 = selector.select(10000)
var rc2 = selector.select(10000)
# if this flakes, see tests/m14634.nim
assert len(rc1) == 1 and len(rc2) == 1, $(len(rc1), len(rc2))
selector.unregister(timer)
discard selector.select(0)
selector.registerTimer(100, true, 0)
var rc4 = selector.select(120)
var rc5 = selector.select(120)
assert(len(rc4) == 1 and len(rc5) == 0)
var rc4 = selector.select(10000)
var rc5 = selector.select(1000) # this will be an actual wait, keep it small
assert len(rc4) == 1 and len(rc5) == 0, $(len(rc4), len(rc5))
assert(selector.isEmpty())
selector.close()
result = true

48
tests/m14634.nim Normal file
View File

@@ -0,0 +1,48 @@
#[
Tool to investigate underlying reasons for https://github.com/nim-lang/Nim/pull/14634
nim r --threads:on -d:threadsafe tests/m14634.nim
]#
when not defined(windows):
import std/selectors
type TestData = object
s1, s2, s3: int
proc timerNotificationTestImpl(data: var TestData) =
var selector = newSelector[int]()
let t0 = 5
var timer = selector.registerTimer(t0, false, 0)
let t = 2000
# values too close to `t0` cause the test to be flaky in CI on OSX+freebsd
# When running locally, t0=100, t=98 will succeed some of the time which indicates
# there is some lag involved. Note that the higher `t-t0` is, the less times
# the test fails.
var rc1 = selector.select(t)
var rc2 = selector.select(t)
assert len(rc1) <= 1 and len(rc2) <= 1
data.s1 += ord(len(rc1) == 1)
data.s2 += ord(len(rc2) == 1)
selector.unregister(timer)
discard selector.select(0)
selector.registerTimer(t0, true, 0)
# same comment as above
var rc4 = selector.select(t)
let t2 = 100
# this can't be too large as it'll actually wait that long:
# timer_notification_test.n * t2
var rc5 = selector.select(t2)
assert len(rc4) + len(rc5) <= 1
data.s3 += ord(len(rc4) + len(rc5) == 1)
assert(selector.isEmpty())
selector.close()
proc timerNotificationTest() =
var data: TestData
let n = 10
for i in 0..<n:
timerNotificationTestImpl(data)
doAssert data.s1 == n and data.s2 == n and data.s3 == n, $data
when isMainModule:
timerNotificationTest()