[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: syscalls: 'interface-address' can return #f.
|
From: |
Ludovic Courtès |
|
Subject: |
02/02: syscalls: 'interface-address' can return #f. |
|
Date: |
Fri, 25 Mar 2016 16:30:54 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 7adbe85e60fce61d0082a9c46604a26d651cb87a
Author: Ludovic Courtès <address@hidden>
Date: Fri Mar 25 17:29:36 2016 +0100
syscalls: 'interface-address' can return #f.
Fixes <http://bugs.gnu.org/22612>.
Reported by Danny Milosavljevic <address@hidden>.
* tests/syscalls.scm ("network-interfaces returns one or more
interfaces"): Accept 'interface-address' value of #f.
---
tests/syscalls.scm | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index a57a9ca..feeb74c 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <address@hidden>
;;; Copyright © 2015 David Thompson <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -223,7 +223,11 @@
((interfaces ..1)
(list (every interface? interfaces)
(every string? (map interface-name interfaces))
- (every vector? (map interface-address interfaces))))))
+ (every (lambda (sockaddr)
+ ;; Sometimes interfaces have no associated address.
+ (or (vector? sockaddr)
+ (not sockaddr)))
+ (map interface-address interfaces))))))
(test-equal "network-interfaces returns \"lo\""
(list #t (make-socket-address AF_INET (inet-pton AF_INET "127.0.0.1") 0))