fix #14320 (tasyncawait.nim is recently very flaky) + avoid hardcoding service ports everywhere + flakyAssert (#14327)

* hotfix #14320 tasyncawait.nim is recently very flaky
* fix #14327
* add flakyAssert
This commit is contained in:
Timothee Cour 2020-05-13 02:05:47 -07:00 • committed by GitHub
commit 1648f1dd99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 102 additions and 92 deletions

View file

@ -1,8 +1,5 @@
discard """
output: "2000"
"""
import asyncdispatch, asyncnet, nativesockets, net, strutils, os
import asyncdispatch, asyncnet, nativesockets, net, strutils
from stdtest/netutils import bindAvailablePort
var msgCount = 0
const
@ -42,26 +39,18 @@ proc readMessages(client: AsyncFD) {.async.} =
else:
doAssert false
proc createServer(port: Port) {.async.} =
var server = createAsyncNativeSocket()
block:
var name: Sockaddr_in
name.sin_family = typeof(name.sin_family)(toInt(AF_INET))
name.sin_port = htons(uint16(port))
name.sin_addr.s_addr = htonl(INADDR_ANY)
if bindAddr(server.SocketHandle, cast[ptr SockAddr](addr(name)),
sizeof(name).Socklen) < 0'i32:
raiseOSError(osLastError())
proc createServer(server: AsyncFD) {.async.} =
discard server.SocketHandle.listen()
while true:
asyncCheck readMessages(await accept(server))
asyncCheck createServer(Port(10335))
asyncCheck launchSwarm(Port(10335))
let server = createAsyncNativeSocket()
let port = bindAvailablePort(server.SocketHandle)
asyncCheck createServer(server)
asyncCheck launchSwarm(port)
while true:
poll()
if clientCount == swarmSize: break
assert msgCount == swarmSize * messagesToSend
echo msgCount
doAssert msgCount == 2000

View file

@ -2,7 +2,8 @@ discard """
output: "20000"
cmd: "nim c -d:nimTypeNames -d:nimCycleBreaker $file"
"""
import asyncdispatch, asyncnet, nativesockets, net, strutils, os
import asyncdispatch, asyncnet, nativesockets, net, strutils
from stdtest/netutils import bindAvailablePort
var msgCount = 0
@ -43,23 +44,15 @@ proc readMessages(client: AsyncFD) {.async.} =
else:
doAssert false
proc createServer(port: Port) {.async.} =
var server = createAsyncNativeSocket()
block:
var name: Sockaddr_in
name.sin_family = typeof(name.sin_family)(toInt(AF_INET))
name.sin_port = htons(uint16(port))
name.sin_addr.s_addr = htonl(INADDR_ANY)
if bindAddr(server.SocketHandle, cast[ptr SockAddr](addr(name)),
sizeof(name).Socklen) < 0'i32:
raiseOSError(osLastError())
proc createServer(server: AsyncFD) {.async.} =
discard server.SocketHandle.listen()
while true:
asyncCheck readMessages(await accept(server))
asyncCheck createServer(Port(10335))
asyncCheck launchSwarm(Port(10335))
let server = createAsyncNativeSocket()
let port = bindAvailablePort(server.SocketHandle)
asyncCheck createServer(server)
asyncCheck launchSwarm(port)
while true:
poll()
GC_collectZct()

View file

@ -1,24 +1,24 @@
discard """
output: "Finished"
"""
import asyncdispatch, asyncnet
proc createServer(port: Port) {.async.} =
var port: Port
proc createServer() {.async.} =
var server = newAsyncSocket()
server.setSockOpt(OptReuseAddr, true)
bindAddr(server, port)
bindAddr(server)
port = getLocalAddr(server)[1]
server.listen()
while true:
let client = await server.accept()
discard await client.recvLine()
asyncCheck createServer(10335.Port)
asyncCheck createServer()
var done = false
proc f(): Future[void] {.async.} =
let s = newAsyncNativeSocket()
await s.connect("localhost", 10335.Port)
let s = createAsyncNativeSocket()
await s.connect("localhost", port)
await s.send("123")
echo "Finished"
done = true
waitFor f()
doAssert done

View file

@ -1,16 +1,12 @@
discard """
cmd: "nim $target --hints:on --define:ssl $options $file"
output: "500"
disabled: "windows"
target: c
action: compile
"""
# XXX, deactivated
import asyncdispatch, asyncnet, net, strutils, os
import asyncdispatch, asyncnet, net, strutils
import stdtest/testutils
when defined(ssl):
var port0: Port
var msgCount = 0
const
@ -45,25 +41,33 @@ when defined(ssl):
else:
doAssert false
proc createServer(port: Port) {.async.} =
proc createServer() {.async.} =
let serverContext = newContext(verifyMode = CVerifyNone,
certFile = "tests/testdata/mycert.pem",
keyFile = "tests/testdata/mycert.pem")
var server = newAsyncSocket()
serverContext.wrapSocket(server)
server.setSockOpt(OptReuseAddr, true)
bindAddr(server, port)
bindAddr(server)
port0 = getLocalAddr(server)[1]
server.listen()
while true:
let client = await accept(server)
serverContext.wrapConnectedSocket(client, handshakeAsServer)
asyncCheck readMessages(client)
asyncCheck createServer(Port(10335))
asyncCheck launchSwarm(Port(10335))
asyncCheck createServer()
asyncCheck launchSwarm(port0)
while true:
poll()
if clientCount == swarmSize: break
assert msgCount == swarmSize * messagesToSend
echo msgCount
template cond(): bool = msgCount == swarmSize * messagesToSend
when defined(windows):
# currently: msgCount == 0
flakyAssert cond()
elif defined(linux) and int.sizeof == 8:
# currently: msgCount == 10
flakyAssert cond()
assert msgCount > 0
else: assert cond(), $msgCount

View file

@ -1,9 +1,6 @@
discard """
output: "5000"
"""
when defined(windows):
import asyncdispatch, nativesockets, net, strutils, os, winlean
from stdtest/netutils import bindAvailablePort
var msgCount = 0
const
@ -228,29 +225,19 @@ when defined(windows):
else:
doAssert false
proc createServer(port: Port) {.async.} =
var server = createNativeSocket()
setBlocking(server, false)
block:
var name = Sockaddr_in()
name.sin_family = toInt(Domain.AF_INET).uint16
name.sin_port = htons(uint16(port))
name.sin_addr.s_addr = htonl(INADDR_ANY)
if bindAddr(server, cast[ptr SockAddr](addr(name)),
sizeof(name).Socklen) < 0'i32:
raiseOSError(osLastError())
proc createServer(server: SocketHandle) {.async.} =
discard server.listen()
while true:
asyncCheck readMessages(await winAccept(AsyncFD(server)))
asyncCheck createServer(Port(10335))
asyncCheck launchSwarm(Port(10335))
var server = createNativeSocket()
setBlocking(server, false)
let port = bindAvailablePort(server)
asyncCheck createServer(server)
asyncCheck launchSwarm(port)
while true:
poll()
if clientCount == swarmSize: break
assert msgCount == swarmSize * messagesToSend
echo msgCount
else:
echo(5000)
doAssert msgCount == 5000