Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix nim CI; fix local testament #14102

Merged
merged 5 commits into from
Apr 24, 2020
Merged

fix nim CI; fix local testament #14102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae17845
WIP fix broken nim CI in thttpclient_ssl.nim
timotheecour Apr 24, 2020
6259f01
fix nim CI thttpclient_ssl.nim; fix important_packages on OSX
timotheecour Apr 24, 2020
9c644ba
disable important_packages: inim pending https://github.com/inim-repl…
timotheecour Apr 24, 2020
a9fc334
_
timotheecour Apr 24, 2020
55afe27
remove ref to https://github.com/nim-lang/Nim/pull/10558
timotheecour Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions testament/important_packages.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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"
Expand All @@ -50,9 +50,10 @@ pkg "neo", true, "nim c -d:blas=openblas tests/all.nim"
pkg "nicy", false, "nim c src/nicy.nim"

when defined(osx):
# do this more generally by installing non-nim dependencies automatically
# as specified in nimble file
doAssert execShellCmd("brew install gtk+3") == 0
# xxx: do this more generally by installing non-nim dependencies automatically
# as specified in nimble file and calling `distros.foreignDepInstallCmd`, but
# 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 "nimcrypto", false, "nim c -r tests/testall.nim"
Expand Down
5 changes: 4 additions & 1 deletion tests/stdlib/thttpclient_ssl.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,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)
5 changes: 3 additions & 2 deletions tests/untestable/thttpclient_ssl.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down