summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
authorTimothee Cour <timothee.cour2@gmail.com>2020-04-24 01:24:30 -0700
committerGitHub <noreply@github.com>2020-04-24 10:24:30 +0200
commitd5b7e9902cf9ac2c24be8792555cb017d268ce91 (patch)
tree49aea07a4a3b95ca1c317afde6b9f043a1120078 /tests
parentd5d35944575fe6fccbacb6f3653a9be8208e1a17 (diff)
downloadNim-d5b7e9902cf9ac2c24be8792555cb017d268ce91.tar.gz
fix nim CI; fix local testament (#14102)
Diffstat (limited to 'tests')
-rw-r--r--tests/stdlib/thttpclient_ssl.nim5
-rw-r--r--tests/untestable/thttpclient_ssl.nim5
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/stdlib/thttpclient_ssl.nim b/tests/stdlib/thttpclient_ssl.nim
index aa278c811..2e9d1c5be 100644
--- a/tests/stdlib/thttpclient_ssl.nim
+++ b/tests/stdlib/thttpclient_ssl.nim
@@ -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)
diff --git a/tests/untestable/thttpclient_ssl.nim b/tests/untestable/thttpclient_ssl.nim
index 3744df92d..353567085 100644
--- a/tests/untestable/thttpclient_ssl.nim
+++ b/tests/untestable/thttpclient_ssl.nim
@@ -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