[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master d087dcf: Fix network stream tests
From: |
Robert Pluim |
Subject: |
[Emacs-diffs] master d087dcf: Fix network stream tests |
Date: |
Tue, 5 Feb 2019 09:53:33 -0500 (EST) |
branch: master
commit d087dcf140ed1dafff4d64aee75d8becc621b848
Author: Robert Pluim <address@hidden>
Commit: Robert Pluim <address@hidden>
Fix network stream tests
* test/lisp/net/network-stream-tests.el
(make-ipv6-tcp-server-with-unspecified-port): Skip if IPv6 is not available.
(make-ipv6-tcp-server-with-specified-port): Likewise.
(echo-server-with-local-ipv6): Likewise.
---
test/lisp/net/network-stream-tests.el | 60 ++++++++++++++++++++---------------
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/test/lisp/net/network-stream-tests.el
b/test/lisp/net/network-stream-tests.el
index 6151c30..b85746a 100644
--- a/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@ -72,28 +72,34 @@
(delete-process server)))
(ert-deftest make-ipv6-tcp-server-with-unspecified-port ()
+ (skip-unless (featurep 'make-network-process '(:family ipv6)))
(let ((server
- (make-network-process
- :name "server"
- :server t
- :noquery t
- :family 'ipv6
- :service t
- :host 'local)))
+ (ignore-errors
+ (make-network-process
+ :name "server"
+ :server t
+ :noquery t
+ :family 'ipv6
+ :service t
+ :host 'local))))
+ (skip-unless server)
(should (and (arrayp (process-contact server :local))
(numberp (aref (process-contact server :local) 8))
(> (aref (process-contact server :local) 8) 0)))
(delete-process server)))
(ert-deftest make-ipv6-tcp-server-with-specified-port ()
+ (skip-unless (featurep 'make-network-process '(:family ipv6)))
(let ((server
- (make-network-process
- :name "server"
- :server t
- :noquery t
- :family 'ipv6
- :service 57870
- :host 'local)))
+ (ignore-errors
+ (make-network-process
+ :name "server"
+ :server t
+ :noquery t
+ :family 'ipv6
+ :service 57870
+ :host 'local))))
+ (skip-unless server)
(should (and (arrayp (process-contact server :local))
(= (aref (process-contact server :local) 8) 57870)))
(delete-process server)))
@@ -171,18 +177,20 @@
(delete-process server)))
(ert-deftest echo-server-with-local-ipv6 ()
- (let* ((server (make-server 'local 'ipv6))
- (port (aref (process-contact server :local) 8))
- (proc (make-network-process :name "foo"
- :buffer (generate-new-buffer "*foo*")
- :host 'local
- :family 'ipv6
- :service port)))
- (with-current-buffer (process-buffer proc)
- (process-send-string proc "echo foo")
- (sleep-for 0.1)
- (should (equal (buffer-string) "foo\n")))
- (delete-process server)))
+ (skip-unless (featurep 'make-network-process '(:family ipv6)))
+ (let ((server (ignore-errors (make-server 'local 'ipv6))))
+ (skip-unless server)
+ (let* ((port (aref (process-contact server :local) 8))
+ (proc (make-network-process :name "foo"
+ :buffer (generate-new-buffer "*foo*")
+ :host 'local
+ :family 'ipv6
+ :service port)))
+ (with-current-buffer (process-buffer proc)
+ (process-send-string proc "echo foo")
+ (sleep-for 0.1)
+ (should (equal (buffer-string) "foo\n")))
+ (delete-process server))))
(ert-deftest echo-server-with-ip ()
(let* ((server (make-server 'local))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master d087dcf: Fix network stream tests,
Robert Pluim <=