diff options
| author | Eli Zaretskii | 2016-02-13 15:17:51 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2016-02-13 15:17:51 +0200 |
| commit | f96cfce306ddceae9502a1962bc5030854c7acb2 (patch) | |
| tree | 1efe240de04c5ad1f6cb6fe9a9b7bb5e7aab3d1d | |
| parent | d98ae99839a81c6279387a5e7679298f799fa99e (diff) | |
| download | emacs-f96cfce306ddceae9502a1962bc5030854c7acb2.tar.gz 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.el | 5 |
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 @@ | |||
| 192 | (setq status (gnutls-peer-status proc)) | 192 | (setq status (gnutls-peer-status proc)) |
| 193 | (should (consp status)) | 193 | (should (consp status)) |
| 194 | (delete-process proc) | 194 | (delete-process proc) |
| 195 | ;; This sleep-for is needed for the native MS-Windows build. If | ||
| 196 | ;; it is removed, the next test mysteriously fails because the | ||
| 197 | ;; initial part of the echo is not received. | ||
| 198 | (sleep-for 0.1) | ||
| 195 | (let ((issuer (plist-get (plist-get status :certificate) :issuer))) | 199 | (let ((issuer (plist-get (plist-get status :certificate) :issuer))) |
| 196 | (should (stringp issuer)) | 200 | (should (stringp issuer)) |
| 197 | (setq issuer (split-string issuer ",")) | 201 | (setq issuer (split-string issuer ",")) |
| @@ -200,6 +204,7 @@ | |||
| 200 | (ert-deftest connect-to-tls-ipv6-nowait () | 204 | (ert-deftest connect-to-tls-ipv6-nowait () |
| 201 | (skip-unless (executable-find "gnutls-serv")) | 205 | (skip-unless (executable-find "gnutls-serv")) |
| 202 | (skip-unless (gnutls-available-p)) | 206 | (skip-unless (gnutls-available-p)) |
| 207 | (skip-unless (not (eq system-type 'windows-nt))) | ||
| 203 | (let ((server (make-tls-server)) | 208 | (let ((server (make-tls-server)) |
| 204 | (times 0) | 209 | (times 0) |
| 205 | proc status) | 210 | proc status) |