Adding test for recvline

Signed-off-by: Euan Torano <euantorano@gmail.com>
This commit is contained in:
Euan Torano
2017-07-09 20:50:47 +01:00
parent a5681d03e3
commit 3f3853945d
2 changed files with 56 additions and 4 deletions

View File

@@ -533,15 +533,13 @@ proc recvLineInto*(socket: AsyncSocket, resString: FutureVar[string],
else:
var c = ""
while true:
let recvFut = recv(socket, 1, flags)
c = await recvFut
c = await recv(socket, 1, flags)
if c.len == 0:
resString.mget.setLen(0)
resString.complete()
return
if c == "\r":
let recvFut = recv(socket, 1, flags) # Skip \L
c = await recvFut
c = await recv(socket, 1, flags) # Skip \L
assert c == "\L"
addNLIfEmpty()
resString.complete()

View File

@@ -0,0 +1,54 @@
discard """
file: "tasyncsend4754.nim"
output: '''
Hello World
Hello World
'''
"""
import asyncdispatch, asyncnet
const recvLinePort = Port(6047)
proc setupTestServer(): AsyncSocket =
result = newAsyncSocket()
result.setSockOpt(OptReuseAddr, true)
result.bindAddr(recvLinePort)
result.listen()
proc testUnbuffered(): Future[void] {.async.} =
let serverSock = setupTestServer()
let serverAcceptClientFut = serverSock.accept()
let clientSock = newAsyncSocket(buffered = false)
let clientConnectFut = clientSock.connect("localhost", recvLinePort)
let serverAcceptedClient = await serverAcceptClientFut
await clientConnectFut
await serverAcceptedClient.send("Hello World\c\L")
echo await clientSock.recvLine()
clientSock.close()
serverSock.close()
proc testBuffered(): Future[void] {.async.} =
let serverSock = setupTestServer()
let serverAcceptClientFut = serverSock.accept()
let clientSock = newAsyncSocket(buffered = true)
let clientConnectFut = clientSock.connect("localhost", recvLinePort)
let serverAcceptedClient = await serverAcceptClientFut
await clientConnectFut
await serverAcceptedClient.send("Hello World\c\L")
echo await clientSock.recvLine()
clientSock.close()
serverSock.close()
waitFor testUnbuffered()
waitFor testBuffered()