From 06912460b4d1d61017cfac139845c9ffd219fb94 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 22 Apr 2014 07:41:23 -0700 Subject: [PATCH] io.sockets.secure.openssl: use must-fail-with. --- .../secure/openssl/openssl-tests.factor | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/basis/io/sockets/secure/openssl/openssl-tests.factor b/basis/io/sockets/secure/openssl/openssl-tests.factor index 4949e1fe71..1abc74d54f 100644 --- a/basis/io/sockets/secure/openssl/openssl-tests.factor +++ b/basis/io/sockets/secure/openssl/openssl-tests.factor @@ -15,14 +15,12 @@ IN: io.sockets.secure.openssl.tests AF_INET SOCK_STREAM IPPROTO_TCP socket ; : socket-connect ( remote -- socket ) - inet-socket swap dupd make-sockaddr/size connect drop ; + inet-socket swap dupd make-sockaddr/size connect 0 assert= ; : ssl-socket-connect ( remote -- ssl-socket ) socket-connect os windows? [ alien-address ] when BIO_NOCLOSE BIO_new_socket ; -[ 200 ] [ "https://www.google.se" http-get drop code>> ] unit-test - : remote ( url -- remote ) url-addr addrspec>> resolve-host first ; @@ -49,16 +47,13 @@ IN: io.sockets.secure.openssl.tests SSL_get_peer_certificate subject-name ] unit-test -[ t ] [ - 8887 >>insecure f >>secure [ - [ - "https://localhost:8887" http-get - ] [ certificate-missing-error? ] recover - ] with-threaded-server -] unit-test +{ 200 } [ "https://www.google.se" http-get drop code>> ] unit-test -[ t ] [ - [ - "test" 33 handle>> check-subject-name - ] [ certificate-missing-error? ] recover -] unit-test +[ + 8887 >>insecure f >>secure [ + "https://localhost:8887" http-get + ] with-threaded-server +] [ certificate-missing-error? ] must-fail-with + +[ "test" 33 handle>> check-subject-name ] +[ certificate-missing-error? ] must-fail-with