summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-02-13 15:17:51 +0200
committerEli Zaretskii <eliz@gnu.org>2016-02-13 15:17:51 +0200
commitf96cfce306ddceae9502a1962bc5030854c7acb2 (patch)
tree1efe240de04c5ad1f6cb6fe9a9b7bb5e7aab3d1d
parentd98ae99839a81c6279387a5e7679298f799fa99e (diff)
downloademacs-f96cfce306ddceae9502a1962bc5030854c7acb2.tar.gz
emacs-f96cfce306ddceae9502a1962bc5030854c7acb2.tar.bz2
emacs-f96cfce306ddceae9502a1962bc5030854c7acb2.zip
Fix network-stream-tests.el for MS-Windows
* test/lisp/net/network-stream-tests.el (connect-to-tls-ipv6-nowait): Skip for MS-Windows builds. (connect-to-tls-ipv4-wait): Add a 0.1 sleep-for.
-rw-r--r--test/lisp/net/network-stream-tests.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/test/lisp/net/network-stream-tests.el b/test/lisp/net/network-stream-tests.el
index 92c5370d527..a5e146f02c8 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -192,6 +192,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 ","))
@@ -200,6 +204,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))
(times 0)
proc status)