aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-02-09 10:16:14 +1100
committerLars Ingebrigtsen2016-02-09 11:28:26 +1100
commita2d6d79c952e1cbb3387fb33ead9b3ddee880a21 (patch)
treecccc8d4e37edd39b05177ee35f6d1849d0be5c20
parent04913ccfa9fec9421f36b1cb46c9a4596e0ec1f3 (diff)
downloademacs-a2d6d79c952e1cbb3387fb33ead9b3ddee880a21.tar.gz
emacs-a2d6d79c952e1cbb3387fb33ead9b3ddee880a21.zip
Use gnutls-serv instead of openssh
* test/lisp/net/network-stream-tests.el (make-tls-server): Use gnutls-serv instead of openssh.
-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 ad7c1fc7d2b..9d9d561f9f5 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -156,23 +156,23 @@
156 (delete-process server))) 156 (delete-process server)))
157 157
158(defun make-tls-server () 158(defun make-tls-server ()
159 (start-process "openssl" (generate-new-buffer "*tls*") "openssl" 159 (start-process "gnutls" (generate-new-buffer "*tls*")
160 "s_server" "-key" "lisp/net/key.pem" 160 "gnutls-serv" "--http"
161 "-cert" "lisp/net/cert.pem" 161 "--x509keyfile" "lisp/net/key.pem"
162 "-accept" "44330" 162 "--x509certfile" "lisp/net/cert.pem"
163 "-www")) 163 "--port" "44330"))
164 164
165(ert-deftest connect-to-tls () 165(ert-deftest connect-to-tls ()
166 (skip-unless (executable-find "openssl")) 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))
169 (times 0) 169 (times 0)
170 proc status) 170 proc status)
171 (sleep-for 1) 171 (sleep-for 1)
172 (with-current-buffer (process-buffer server) 172 (with-current-buffer (process-buffer server)
173 (message "openssl: %s" (buffer-string))) 173 (message "gnutls-serv: %s" (buffer-string)))
174 174
175 ;; It takes a while for openssl to start. 175 ;; It takes a while for gnutls-serv to start.
176 (while (and (null (ignore-errors 176 (while (and (null (ignore-errors
177 (setq proc (make-network-process 177 (setq proc (make-network-process
178 :name "bar" 178 :name "bar"