aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-09 10:24:34 +1100
committerLars Ingebrigtsen2016-02-09 11:28:36 +1100
commit71f22453a5fabbf7d21c8b34bfc2d107eed1db68 (patch)
tree0fadcd77faf6510882cfc9937cad0c694a26bed5
parenta2d6d79c952e1cbb3387fb33ead9b3ddee880a21 (diff)
downloademacs-71f22453a5fabbf7d21c8b34bfc2d107eed1db68.tar.gz
emacs-71f22453a5fabbf7d21c8b34bfc2d107eed1db68.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.el36
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 9d9d561f9f5..a50c7f067b9 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -162,7 +162,7 @@
162 "--x509certfile" "lisp/net/cert.pem" 162 "--x509certfile" "lisp/net/cert.pem"
163 "--port" "44330")) 163 "--port" "44330"))
164 164
165(ert-deftest connect-to-tls () 165(ert-deftest connect-to-tls-ipv4-wait ()
166 (skip-unless (executable-find "gnutls-serv")) 166 (skip-unless (executable-find "gnutls-serv"))
167 (skip-unless (gnutls-available-p)) 167 (skip-unless (gnutls-available-p))
168 (let ((server (make-tls-server)) 168 (let ((server (make-tls-server))
@@ -194,4 +194,38 @@
194 (setq issuer (split-string issuer ",")) 194 (setq issuer (split-string issuer ","))
195 (should (equal (nth 3 issuer) "O=Emacs Test Servicess LLC"))))) 195 (should (equal (nth 3 issuer) "O=Emacs Test Servicess LLC")))))
196 196
197(ert-deftest connect-to-tls-ipv6-nowait ()
198 (skip-unless (executable-find "gnutls-serv"))
199 (skip-unless (gnutls-available-p))
200 (let ((server (make-tls-server))
201 (times 0)
202 proc status)
203 (sleep-for 1)
204 (with-current-buffer (process-buffer server)
205 (message "gnutls-serv: %s" (buffer-string)))
206
207 ;; It takes a while for gnutls-serv to start.
208 (while (and (null (ignore-errors
209 (setq proc (make-network-process
210 :name "bar"
211 :buffer (generate-new-buffer "*foo*")
212 :family 'ipv6
213 :nowait t
214 :host "::1"
215 :service 44330))))
216 (< (setq times (1+ times)) 10))
217 (sit-for 0.1))
218 (should proc)
219 (gnutls-negotiate :process proc
220 :type 'gnutls-x509pki
221 :hostname "localhost")
222 (delete-process server)
223 (setq status (gnutls-peer-status proc))
224 (should (consp status))
225 (delete-process proc)
226 (let ((issuer (plist-get (plist-get status :certificate) :issuer)))
227 (should (stringp issuer))
228 (setq issuer (split-string issuer ","))
229 (should (equal (nth 3 issuer) "O=Emacs Test Servicess LLC")))))
230
197;;; network-stream-tests.el ends here 231;;; network-stream-tests.el ends here