diff options
| author | Lars Ingebrigtsen | 2016-02-09 10:24:34 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-09 10:24:34 +1100 |
| commit | 8e7703e83248e4de57b87ff58891b2b832b57fe7 (patch) | |
| tree | d597fd917b2b1ce99ee70761e3c05786b561c1ad | |
| parent | fbde8feb79f2e74725c0ca17049fb9a8a9fb6ef2 (diff) | |
| download | emacs-8e7703e83248e4de57b87ff58891b2b832b57fe7.tar.gz emacs-8e7703e83248e4de57b87ff58891b2b832b57fe7.zip | |
Add an IPv6 test
* test/lisp/net/network-stream-tests.el
(connect-to-tls-ipv6-nowait): Add an ipv6 test, too.
| -rw-r--r-- | test/lisp/net/network-stream-tests.el | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el index fedeea8351a..734f0771cd7 100644 --- a/test/lisp/net/network-stream-tests.el +++ b/test/lisp/net/network-stream-tests.el | |||
| @@ -164,7 +164,7 @@ | |||
| 164 | "--x509certfile" "lisp/net/cert.pem" | 164 | "--x509certfile" "lisp/net/cert.pem" |
| 165 | "--port" "44330")) | 165 | "--port" "44330")) |
| 166 | 166 | ||
| 167 | (ert-deftest connect-to-tls () | 167 | (ert-deftest connect-to-tls-ipv4-wait () |
| 168 | (skip-unless (executable-find "gnutls-serv")) | 168 | (skip-unless (executable-find "gnutls-serv")) |
| 169 | (skip-unless (gnutls-available-p)) | 169 | (skip-unless (gnutls-available-p)) |
| 170 | (let ((server (make-tls-server)) | 170 | (let ((server (make-tls-server)) |
| @@ -196,4 +196,38 @@ | |||
| 196 | (setq issuer (split-string issuer ",")) | 196 | (setq issuer (split-string issuer ",")) |
| 197 | (should (equal (nth 3 issuer) "O=Emacs Test Servicess LLC"))))) | 197 | (should (equal (nth 3 issuer) "O=Emacs Test Servicess LLC"))))) |
| 198 | 198 | ||
| 199 | (ert-deftest connect-to-tls-ipv6-nowait () | ||
| 200 | (skip-unless (executable-find "gnutls-serv")) | ||
| 201 | (skip-unless (gnutls-available-p)) | ||
| 202 | (let ((server (make-tls-server)) | ||
| 203 | (times 0) | ||
| 204 | proc status) | ||
| 205 | (sleep-for 1) | ||
| 206 | (with-current-buffer (process-buffer server) | ||
| 207 | (message "gnutls-serv: %s" (buffer-string))) | ||
| 208 | |||
| 209 | ;; It takes a while for gnutls-serv to start. | ||
| 210 | (while (and (null (ignore-errors | ||
| 211 | (setq proc (make-network-process | ||
| 212 | :name "bar" | ||
| 213 | :buffer (generate-new-buffer "*foo*") | ||
| 214 | :family 'ipv6 | ||
| 215 | :nowait t | ||
| 216 | :host "::1" | ||
| 217 | :service 44330)))) | ||
| 218 | (< (setq times (1+ times)) 10)) | ||
| 219 | (sit-for 0.1)) | ||
| 220 | (should proc) | ||
| 221 | (gnutls-negotiate :process proc | ||
| 222 | :type 'gnutls-x509pki | ||
| 223 | :hostname "localhost") | ||
| 224 | (delete-process server) | ||
| 225 | (setq status (gnutls-peer-status proc)) | ||
| 226 | (should (consp status)) | ||
| 227 | (delete-process proc) | ||
| 228 | (let ((issuer (plist-get (plist-get status :certificate) :issuer))) | ||
| 229 | (should (stringp issuer)) | ||
| 230 | (setq issuer (split-string issuer ",")) | ||
| 231 | (should (equal (nth 3 issuer) "O=Emacs Test Servicess LLC"))))) | ||
| 232 | |||
| 199 | ;;; network-stream-tests.el ends here | 233 | ;;; network-stream-tests.el ends here |