[Emacs-diffs] master fbde8fe: Use gnutls-serv instead of openssh

[Lars Ingebrigtsen]

branch: master
commit fbde8feb79f2e74725c0ca17049fb9a8a9fb6ef2
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Use gnutls-serv instead of openssh
    
    * test/lisp/net/network-stream-tests.el (make-tls-server): Use
    gnutls-serv instead of openssh.
---
 test/lisp/net/network-stream-tests.el |   16 ++++++++--------
 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 863064d..fedeea8 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -158,23 +158,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"