fix nim CI; fix local testament (#14102)

(cherry picked from commit d5b7e9902c)
This commit is contained in:
Timothee Cour
2020-04-24 01:24:30 -07:00
committed by narimiran
parent b306c1a449
commit b8573064e0
3 changed files with 8 additions and 4 deletions

View File

@@ -36,7 +36,7 @@ pkg "glob"
pkg "gnuplot"
pkg "hts", false, "nim c -o:htss src/hts.nim"
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 "iterutils"
pkg "jstin"

View File

@@ -123,4 +123,7 @@ when not defined(windows):
let msg = getCurrentExceptionMsg()
log "client: exception: " & msg
# 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)

View File

@@ -101,11 +101,12 @@ template evaluate(exception_msg: string, category: Category, desc: string) =
if category in {good_broken, dubious_broken, bad_broken}:
skip()
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.contains("certificate verify failed") 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:
# this is unexpected