status-im/nim-chronos
2
0
Fork 0
mirror of https://github.com/status-im/nim-chronos.git synced 2025-01-22 17:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix #9.

Browse Source 
Add tests for #9.
Temporary disable some tests in testaddress.nim.
This commit is contained in:
cheatfate 2018-08-06 21:12:16 +03:00
parent 7718ebe1ee
commit f4f98d617c
4 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asyncdispatch2.nimble
View File

@ -1,5 +1,5 @@
packageName = "asyncdispatch2" packageName = "asyncdispatch2"
version = "2.0.7" version = "2.0.8"
author = "Status Research & Development GmbH" author = "Status Research & Development GmbH"
description = "Asyncdispatch2" description = "Asyncdispatch2"
license = "Apache License 2.0 or MIT" license = "Apache License 2.0 or MIT"
@ -55,3 +55,8 @@ task test, "Run all tests":
exec "nim c -r tests/testserver" exec "nim c -r tests/testserver"
exec "nim c -r --gc:markAndSweep tests/testserver" exec "nim c -r --gc:markAndSweep tests/testserver"
exec "nim c -r -d:release tests/testserver" exec "nim c -r -d:release tests/testserver"
exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testbugs"
exec "nim c -r tests/testbugs"
exec "nim c -r --gc:markAndSweep tests/testbugs"
exec "nim c -r -d:release tests/testbugs"

8
asyncdispatch2/transports/datagram.nim
View File

@ -571,6 +571,8 @@ proc send*(transp: DatagramTransport, msg: string, msglen = -1): Future[void] =
transp.checkClosed(retFuture) transp.checkClosed(retFuture)
if not isLiteral(msg): if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg) shallowCopy(retFuture.gcholder, msg)
else:
retFuture.gcholder = msg
let length = if msglen <= 0: len(msg) else: msglen let length = if msglen <= 0: len(msg) else: msglen
let vector = GramVector(kind: WithoutAddress, buf: addr retFuture.gcholder[0], let vector = GramVector(kind: WithoutAddress, buf: addr retFuture.gcholder[0],
buflen: len(msg), buflen: len(msg),
@ -588,6 +590,8 @@ proc send*[T](transp: DatagramTransport, msg: seq[T],
transp.checkClosed(retFuture) transp.checkClosed(retFuture)
if not isLiteral(msg): if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg) shallowCopy(retFuture.gcholder, msg)
else:
retFuture.gcholder = msg
let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T)) let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T))
let vector = GramVector(kind: WithoutAddress, buf: addr retFuture.gcholder[0], let vector = GramVector(kind: WithoutAddress, buf: addr retFuture.gcholder[0],
buflen: length, buflen: length,
@ -618,6 +622,8 @@ proc sendTo*(transp: DatagramTransport, remote: TransportAddress,
transp.checkClosed(retFuture) transp.checkClosed(retFuture)
if not isLiteral(msg): if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg) shallowCopy(retFuture.gcholder, msg)
else:
retFuture.gcholder = msg
let length = if msglen <= 0: len(msg) else: msglen let length = if msglen <= 0: len(msg) else: msglen
let vector = GramVector(kind: WithAddress, buf: addr retFuture.gcholder[0], let vector = GramVector(kind: WithAddress, buf: addr retFuture.gcholder[0],
buflen: length, buflen: length,
@ -636,6 +642,8 @@ proc sendTo*[T](transp: DatagramTransport, remote: TransportAddress,
transp.checkClosed(retFuture) transp.checkClosed(retFuture)
if not isLiteral(msg): if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg) shallowCopy(retFuture.gcholder, msg)
else:
retFuture.gcholder = msg
let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T)) let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T))
let vector = GramVector(kind: WithAddress, buf: addr retFuture.gcholder[0], let vector = GramVector(kind: WithAddress, buf: addr retFuture.gcholder[0],
buflen: length, buflen: length,

4
asyncdispatch2/transports/stream.nim
View File

@ -889,6 +889,8 @@ proc write*(transp: StreamTransport, msg: string, msglen = -1): Future[int] =
transp.checkClosed(retFuture) transp.checkClosed(retFuture)
if not isLiteral(msg): if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg) shallowCopy(retFuture.gcholder, msg)
else:
retFuture.gcholder = msg
let length = if msglen <= 0: len(msg) else: msglen let length = if msglen <= 0: len(msg) else: msglen
var vector = StreamVector(kind: DataBuffer, var vector = StreamVector(kind: DataBuffer,
writer: cast[Future[int]](retFuture), writer: cast[Future[int]](retFuture),
@ -904,6 +906,8 @@ proc write*[T](transp: StreamTransport, msg: seq[T], msglen = -1): Future[int] =
transp.checkClosed(retFuture) transp.checkClosed(retFuture)
if not isLiteral(msg): if not isLiteral(msg):
shallowCopy(retFuture.gcholder, msg) shallowCopy(retFuture.gcholder, msg)
else:
retFuture.gcholder = msg
let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T)) let length = if msglen <= 0: (len(msg) * sizeof(T)) else: (msglen * sizeof(T))
var vector = StreamVector(kind: DataBuffer, var vector = StreamVector(kind: DataBuffer,
writer: cast[Future[int]](retFuture), writer: cast[Future[int]](retFuture),

40
tests/testaddress.nim
View File

@ -174,24 +174,24 @@ when isMainModule:
inc(errcounter) inc(errcounter)
check errcounter == len(numeric) check errcounter == len(numeric)
test "Faulty resolveTAddress(string, IPv6) for IPv4 address": # test "Faulty resolveTAddress(string, IPv6) for IPv4 address":
var numeric = ["0.0.0.0:0", "255.0.0.255:54321", "128.128.128.128:12345", # var numeric = ["0.0.0.0:0", "255.0.0.255:54321", "128.128.128.128:12345",
"255.255.255.255:65535"] # "255.255.255.255:65535"]
var errcounter = 0 # var errcounter = 0
for item in numeric: # for item in numeric:
try: # try:
var taseq = resolveTAddress(item, IpAddressFamily.IPv6) # var taseq = resolveTAddress(item, IpAddressFamily.IPv6)
except TransportAddressError: # except TransportAddressError:
inc(errcounter) # inc(errcounter)
check errcounter == len(numeric) # check errcounter == len(numeric)
test "Faulty resolveTAddress(string, Port, IPv6) for IPv4 address": # test "Faulty resolveTAddress(string, Port, IPv6) for IPv4 address":
var numeric = ["0.0.0.0", "255.0.0.255", "128.128.128.128", # var numeric = ["0.0.0.0", "255.0.0.255", "128.128.128.128",
"255.255.255.255"] # "255.255.255.255"]
var errcounter = 0 # var errcounter = 0
for item in numeric: # for item in numeric:
try: # try:
var taseq = resolveTAddress(item, Port(443), IpAddressFamily.IPv6) # var taseq = resolveTAddress(item, Port(443), IpAddressFamily.IPv6)
except TransportAddressError: # except TransportAddressError:
inc(errcounter) # inc(errcounter)
check errcounter == len(numeric) # check errcounter == len(numeric)