Fix merge conflicts in network-stream-tests.el

[gnu-emacs] / test / lisp / net / network-stream-tests.el

diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index e19bd528961e6c4cb06de4432f458e24f48113ac..c6a20b09690eb0fdb26f86707f77e94566fa7a33 100644 (file)
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -4,6 +4,8 @@
 
 ;; Author: Lars Ingebrigtsen <larsi@gnus.org>
 
+;; This file is part of GNU Emacs.
+
 ;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
@@ -25,6 +27,7 @@
 (require 'gnutls)
 
 (ert-deftest make-local-unix-server ()
+  (skip-unless (featurep 'make-network-process '(:family local)))
   (let* ((file (make-temp-name "/tmp/server-test"))
          (server
           (make-network-process
@@ -186,6 +189,10 @@
     (setq status (gnutls-peer-status proc))
     (should (consp status))
     (delete-process proc)
+    ;; This sleep-for is needed for the native MS-Windows build.  If
+    ;; it is removed, the next test mysteriously fails because the
+    ;; initial part of the echo is not received.
+    (sleep-for 0.1)
     (let ((issuer (plist-get (plist-get status :certificate) :issuer)))
       (should (stringp issuer))
       (setq issuer (split-string issuer ","))
@@ -230,6 +237,7 @@
 (ert-deftest connect-to-tls-ipv6-nowait ()
   (skip-unless (executable-find "gnutls-serv"))
   (skip-unless (gnutls-available-p))
+  (skip-unless (not (eq system-type 'windows-nt)))
   (let ((server (make-tls-server 44333))
         (times 0)
         proc status)