aboutsummaryrefslogtreecommitdiffstats
path: root/test/lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-09 10:16:14 +1100
committerLars Ingebrigtsen2016-02-09 10:16:33 +1100
commitfbde8feb79f2e74725c0ca17049fb9a8a9fb6ef2 (patch)
tree7dbab9000cbdb190aee827ec90246aa038d9c8be /test/lisp
parentde76a167dc09dc695a5acebabb7ab354a6bf556e (diff)
downloademacs-fbde8feb79f2e74725c0ca17049fb9a8a9fb6ef2.tar.gz
emacs-fbde8feb79f2e74725c0ca17049fb9a8a9fb6ef2.zip
Use gnutls-serv instead of openssh
* test/lisp/net/network-stream-tests.el (make-tls-server): Use gnutls-serv instead of openssh.
Diffstat (limited to 'test/lisp')
-rw-r--r--test/lisp/net/network-stream-tests.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index 863064dd537..fedeea8351a 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -158,23 +158,23 @@
158 (delete-process server))) 158 (delete-process server)))
159 159
160(defun make-tls-server () 160(defun make-tls-server ()
161 (start-process "openssl" (generate-new-buffer "*tls*") "openssl" 161 (start-process "gnutls" (generate-new-buffer "*tls*")
162 "s_server" "-key" "lisp/net/key.pem" 162 "gnutls-serv" "--http"
163 "-cert" "lisp/net/cert.pem" 163 "--x509keyfile" "lisp/net/key.pem"
164 "-accept" "44330" 164 "--x509certfile" "lisp/net/cert.pem"
165 "-www")) 165 "--port" "44330"))
166 166
167(ert-deftest connect-to-tls () 167(ert-deftest connect-to-tls ()
168 (skip-unless (executable-find "openssl")) 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))
171 (times 0) 171 (times 0)
172 proc status) 172 proc status)
173 (sleep-for 1) 173 (sleep-for 1)
174 (with-current-buffer (process-buffer server) 174 (with-current-buffer (process-buffer server)
175 (message "openssl: %s" (buffer-string))) 175 (message "gnutls-serv: %s" (buffer-string)))
176 176
177 ;; It takes a while for openssl to start. 177 ;; It takes a while for gnutls-serv to start.
178 (while (and (null (ignore-errors 178 (while (and (null (ignore-errors
179 (setq proc (make-network-process 179 (setq proc (make-network-process
180 :name "bar" 180 :name "bar"