jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix nim CI; fix local testament (#14102)

Browse source
This commit is contained in:
Timothee Cour 2020-04-24 01:24:30 -07:00 • committed by GitHub
commit d5b7e9902c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
testament/important_packages.nim
View file

@ -37,7 +37,7 @@ pkg "glob"
pkg "gnuplot" pkg "gnuplot"
pkg "hts", false, "nim c -o:htss src/hts.nim" pkg "hts", false, "nim c -o:htss src/hts.nim"
pkg "illwill", false, "nimble examples" pkg "illwill", false, "nimble examples"
pkg "inim", true # pkg "inim", true # pending https://github.com/inim-repl/INim/issues/74
pkg "itertools", false, "nim doc src/itertools.nim" pkg "itertools", false, "nim doc src/itertools.nim"
pkg "iterutils" pkg "iterutils"
pkg "jstin" pkg "jstin"
@ -50,9 +50,10 @@ pkg "neo", true, "nim c -d:blas=openblas tests/all.nim"
pkg "nicy", false, "nim c src/nicy.nim" pkg "nicy", false, "nim c src/nicy.nim"
when defined(osx): when defined(osx):
# do this more generally by installing non-nim dependencies automatically # xxx: do this more generally by installing non-nim dependencies automatically
# as specified in nimble file # as specified in nimble file and calling `distros.foreignDepInstallCmd`, but
doAssert execShellCmd("brew install gtk+3") == 0 # it currently would fail work if a package is already installed.
doAssert execShellCmd("brew ls --versions gtk+3 || brew install gtk+3") == 0
pkg "nigui", false, "nim c -o:niguii -r src/nigui.nim" pkg "nigui", false, "nim c -o:niguii -r src/nigui.nim"
pkg "nimcrypto", false, "nim c -r tests/testall.nim" pkg "nimcrypto", false, "nim c -r tests/testall.nim"

5
tests/stdlib/thttpclient_ssl.nim
View file

@ -124,4 +124,7 @@ when not defined(windows):
let msg = getCurrentExceptionMsg() let msg = getCurrentExceptionMsg()
log "client: exception: " & msg log "client: exception: " & msg
# SSL_shutdown:shutdown while in init # SSL_shutdown:shutdown while in init
check(msg.contains("shutdown while in init") or msg.contains("alert number 48")) if not (msg.contains("shutdown while in init") or msg.contains("alert number 48") or
msg.contains("routines:CONNECT_CR_CERT:certificate verify failed")):
echo "CVerifyPeer exception: " & msg
check(false)

5
tests/untestable/thttpclient_ssl.nim
View file

@ -101,11 +101,12 @@ template evaluate(exception_msg: string, category: Category, desc: string) =
if category in {good_broken, dubious_broken, bad_broken}: if category in {good_broken, dubious_broken, bad_broken}:
skip() skip()
if raised: if raised:
check exception_msg == "No SSL certificate found." or # check exception_msg == "No SSL certificate found." or
doAssert exception_msg == "No SSL certificate found." or
exception_msg == "SSL Certificate check failed." or exception_msg == "SSL Certificate check failed." or
exception_msg.contains("certificate verify failed") or exception_msg.contains("certificate verify failed") or
exception_msg.contains("key too small") or exception_msg.contains("key too small") or
exception_msg.contains "shutdown while in init" exception_msg.contains "shutdown while in init", exception_msg
else: else:
# this is unexpected # this is unexpected