summaryrefslogtreecommitdiff
path: root/test/lisp/net/network-stream-tests.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2016-02-09 10:16:14 +1100
committerLars Ingebrigtsen <larsi@gnus.org>2016-02-09 11:28:26 +1100
commita2d6d79c952e1cbb3387fb33ead9b3ddee880a21 (patch)
treecccc8d4e37edd39b05177ee35f6d1849d0be5c20 /test/lisp/net/network-stream-tests.el
parent04913ccfa9fec9421f36b1cb46c9a4596e0ec1f3 (diff)
downloademacs-a2d6d79c952e1cbb3387fb33ead9b3ddee880a21.tar.gz
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/net/network-stream-tests.el')
-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 @@
(delete-process server)))
(defun make-tls-server ()
- (start-process "openssl" (generate-new-buffer "*tls*") "openssl"
- "s_server" "-key" "lisp/net/key.pem"
- "-cert" "lisp/net/cert.pem"
- "-accept" "44330"
- "-www"))
+ (start-process "gnutls" (generate-new-buffer "*tls*")
+ "gnutls-serv" "--http"
+ "--x509keyfile" "lisp/net/key.pem"
+ "--x509certfile" "lisp/net/cert.pem"
+ "--port" "44330"))
(ert-deftest connect-to-tls ()
- (skip-unless (executable-find "openssl"))
+ (skip-unless (executable-find "gnutls-serv"))
(skip-unless (gnutls-available-p))
(let ((server (make-tls-server))
(times 0)
proc status)
(sleep-for 1)
(with-current-buffer (process-buffer server)
- (message "openssl: %s" (buffer-string)))
+ (message "gnutls-serv: %s" (buffer-string)))
- ;; It takes a while for openssl to start.
+ ;; It takes a while for gnutls-serv to start.
(while (and (null (ignore-errors
(setq proc (make-network-process
:name "bar"